设备基本信息列表查询报错问题修复(深圳三院环境特殊问题，不可合并到其它分支！)

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/entity/EquipmentCardTbl.java

@@ -26,6 +26,14 @@ public class EquipmentCardTbl extends AbstractPo<String>{
 	protected String  tenantId; 		/*租户ID*/
 	@ApiModelProperty(value = "IP地址")
 	protected String  ip; 		/*IP地址*/
+	@ApiModelProperty(value = "创建人")
+	protected String  createBy; 		/*创建人*/
+	@ApiModelProperty(value = "创建时间")
+	protected Date  createTime; 		/*创建时间*/
+	@ApiModelProperty(value = "更新人")
+	protected String  updateBy; 		/*更新人*/
+	@ApiModelProperty(value = "更新时间")
+	protected Date  updateTime; 		/*更新时间*/
 	@ApiModelProperty(value = "仪器设备名称")
 	protected String  sheBeiMingCheng; 		/*仪器设备名称*/
 	@ApiModelProperty(value = "厂商")
@@ -233,6 +241,38 @@ public class EquipmentCardTbl extends AbstractPo<String>{
 	{
 		return this.ip;
 	}
+	public void setCreateBy(String createBy) 
+	{
+		this.createBy = createBy;
+	}
+	public String getCreateBy() 
+	{
+		return this.createBy;
+	}
+	public void setCreateTime(Date createTime) 
+	{
+		this.createTime = createTime;
+	}
+	public Date getCreateTime() 
+	{
+		return this.createTime;
+	}
+	public void setUpdateBy(String updateBy) 
+	{
+		this.updateBy = updateBy;
+	}
+	public String getUpdateBy() 
+	{
+		return this.updateBy;
+	}
+	public void setUpdateTime(Date updateTime) 
+	{
+		this.updateTime = updateTime;
+	}
+	public Date getUpdateTime() 
+	{
+		return this.updateTime;
+	}
 	public void setSheBeiMingCheng(String sheBeiMingCheng) 
 	{
 		this.sheBeiMingCheng = sheBeiMingCheng;

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/equipment/persistence/mapping/EquipmentCard.map.xml

@@ -25,7 +25,7 @@
 		<result property="guanLiRen" column="GUAN_LI_REN_" jdbcType="VARCHAR"/>
 		<result property="weiHuFangShi" column="WEI_HU_FANG_SHI_" jdbcType="VARCHAR"/>
 		<result property="jzfs" column="JZFS" jdbcType="VARCHAR"/>
-		<result property="yqzp" column="YQZP" jdbcType="BLOB"/>
+		<result property="yqzp" column="YQZP" jdbcType="VARCHAR"/>
 		<result property="sheBeiGouMaiS" column="SHE_BEI_GOU_MAI_S" jdbcType="VARCHAR"/>
 		<result property="sheBeiYanShou" column="SHE_BEI_YAN_SHOU" jdbcType="VARCHAR"/>
 		<result property="zongJiHuaWaiJ" column="ZONG_JI_HUA_WAI_J" jdbcType="VARCHAR"/>
@@ -42,7 +42,7 @@
 		<result property="shiFouXiaoZhun" column="SHI_FOU_XIAO_ZHUN" jdbcType="VARCHAR"/>
 		<result property="gongYingShang" column="GONG_YING_SHANG_" jdbcType="VARCHAR"/>
 		<result property="lianXiFangShi" column="LIAN_XI_FANG_SHI_" jdbcType="VARCHAR"/>
-		<result property="beiZhu" column="BEI_ZHU_" jdbcType="BLOB"/>
+		<result property="beiZhu" column="BEI_ZHU_" jdbcType="VARCHAR"/>
 		<result property="xiaoZhunYouXia" column="XIAO_ZHUN_YOU_XIA" jdbcType="VARCHAR"/>
 		<result property="chuChangRiQi" column="CHU_CHANG_RI_QI_" jdbcType="VARCHAR"/>
 		<result property="sheBeiMingChen" column="SHE_BEI_MING_CHEN" jdbcType="VARCHAR"/>
@@ -59,8 +59,8 @@
 		<result property="xiuZhengZhiXiu" column="XIU_ZHENG_ZHI_XIU" jdbcType="VARCHAR"/>
 		<result property="xiaoZhunZQ" column="XIAO_ZHUN_Z_Q_" jdbcType="VARCHAR"/>
 		<result property="zuiDaYunCha" column="ZUI_DA_YUN_CHA_" jdbcType="VARCHAR"/>
-		<result property="caiGouHeTong" column="CAI_GOU_HE_TONG_" jdbcType="BLOB"/>
-		<result property="faPiao" column="FA_PIAO_" jdbcType="BLOB"/>
+		<result property="caiGouHeTong" column="CAI_GOU_HE_TONG_" jdbcType="VARCHAR"/>
+		<result property="faPiao" column="FA_PIAO_" jdbcType="VARCHAR"/>
 		<result property="yuanSheBeiBian" column="YUAN_SHE_BEI_BIAN" jdbcType="VARCHAR"/>
 		<result property="buMen" column="BU_MEN_" jdbcType="VARCHAR"/>
 		<result property="jianKongYiJu" column="JIAN_KONG_YI_JU_" jdbcType="VARCHAR"/>
@@ -72,7 +72,7 @@
 		<result property="zhuangTaiFenXi" column="ZHUANG_TAI_FEN_XI" jdbcType="VARCHAR"/>
 		<result property="shiFouWeiHu" column="SHI_FOU_WEI_HU_" jdbcType="VARCHAR"/>
 		<result property="weiHuZhouQi" column="WEI_HU_ZHOU_QI_" jdbcType="VARCHAR"/>
-		<result property="shiWuShuoMing" column="SHI_WU_SHUO_MING_" jdbcType="BLOB"/>
+		<result property="shiWuShuoMing" column="SHI_WU_SHUO_MING_" jdbcType="VARCHAR"/>
 		<result property="cunFangWeiZhi" column="CUN_FANG_WEI_ZHI_" jdbcType="VARCHAR"/>
 		<result property="wenDuYingYong" column="WEN_DU_YING_YONG_" jdbcType="VARCHAR"/>
 		<result property="shiDuYingYong" column="SHI_DU_YING_YONG_" jdbcType="VARCHAR"/>
@@ -80,15 +80,15 @@
 		<result property="yanShouRiQi" column="YAN_SHOU_RI_QI_" jdbcType="VARCHAR"/>
 		<result property="huanJingYaoQiu" column="HUAN_JING_YAO_QIU" jdbcType="VARCHAR"/>
 		<result property="dianYuanYaoQiu" column="DIAN_YUAN_YAO_QIU" jdbcType="VARCHAR"/>
-		<result property="fuJianShang" column="FU_JIAN_SHANG" jdbcType="BLOB"/>
+		<result property="fuJianShang" column="FU_JIAN_SHANG" jdbcType="VARCHAR"/>
 		<result property="zhuCeZhengHao" column="ZHU_CE_ZHENG_HAO_" jdbcType="VARCHAR"/>
 		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 		<result property="wenJianXiLei" column="WEN_JIAN_XI_LEI_" jdbcType="VARCHAR"/>
 		<result property="xiLeiId" column="XI_LEI_ID_" jdbcType="VARCHAR"/>
 		<result property="quanXianLeiXin" column="QUAN_XIAN_LEI_XIN" jdbcType="VARCHAR"/>
-		<result property="fuZeRenDianHua" column="FU_ZE_REN_DIAN_HU" jdbcType="VARCHAR"/>
-		<result property="changJiaLianXiRen" column="CHANG_JIA_LIAN_XI" jdbcType="VARCHAR"/>
+		<!--<result property="fuZeRenDianHua" column="FU_ZE_REN_DIAN_HU" jdbcType="VARCHAR"/>-->
+		<!--<result property="changJiaLianXiRen" column="CHANG_JIA_LIAN_XI" jdbcType="VARCHAR"/>-->
 		<result property="remark" column="REMARK_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
@@ -102,7 +102,7 @@
 		ZHENG_SHU_BIAN_HA,XIAO_ZHUN_WU_CHA_,XIU_ZHENG_ZHI_XIU,XIAO_ZHUN_Z_Q_,ZUI_DA_YUN_CHA_,CAI_GOU_HE_TONG_,FA_PIAO_,YUAN_SHE_BEI_BIAN,BU_MEN_,
 		JIAN_KONG_YI_JU_,BI_XU_DE_HUAN_JIN,BI_XU_SHE_SHI_,ZI_CHAN_YUAN_ZHI_,ZI_CHAN_BIAN_HAO_,SHI_YONG_KE_SHI_,ZHUANG_TAI_FEN_XI,SHI_FOU_WEI_HU_,
 		WEI_HU_ZHOU_QI_,SHI_WU_SHUO_MING_,CUN_FANG_WEI_ZHI_,WEN_DU_YING_YONG_,SHI_DU_YING_YONG_,JI_SHEN_XU_HAO_,YAN_SHOU_RI_QI_,HUAN_JING_YAO_QIU,
-		DIAN_YUAN_YAO_QIU,FU_JIAN_SHANG,ZHU_CE_ZHENG_HAO_,KUAI_ZHAO_,DI_DIAN_,WEN_JIAN_XI_LEI_,XI_LEI_ID_,QUAN_XIAN_LEI_XIN,FU_ZE_REN_DIAN_HU,CHANG_JIA_LIAN_XI,REMARK_
+		DIAN_YUAN_YAO_QIU,FU_JIAN_SHANG,ZHU_CE_ZHENG_HAO_,KUAI_ZHAO_,DI_DIAN_,WEN_JIAN_XI_LEI_,XI_LEI_ID_,QUAN_XIAN_LEI_XIN,REMARK_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.equipment.persistence.entity.EquipmentCardPo">
@@ -113,22 +113,22 @@
 		 #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{sheBeiMingCheng,jdbcType=VARCHAR}, #{changShang,jdbcType=VARCHAR}, #{guiGeXingHao,jdbcType=VARCHAR},
 		 #{chuChangBianHao,jdbcType=VARCHAR}, #{jieShouRiQi,jdbcType=VARCHAR}, #{qiYongRiQi,jdbcType=VARCHAR}, #{cunFangDiDian,jdbcType=VARCHAR}, #{jieShouZhuangTai,jdbcType=VARCHAR},
 		 #{ccjdsj,jdbcType=VARCHAR}, #{jjzq,jdbcType=VARCHAR}, #{zhuanYeBuMen,jdbcType=VARCHAR}, #{guanLiRen,jdbcType=VARCHAR}, #{weiHuFangShi,jdbcType=VARCHAR}, #{jzfs,jdbcType=VARCHAR},
-		 #{yqzp,jdbcType=BLOB}, #{sheBeiGouMaiS,jdbcType=VARCHAR}, #{sheBeiYanShou,jdbcType=VARCHAR}, #{zongJiHuaWaiJ,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR},
+		 #{yqzp,jdbcType=VARCHAR}, #{sheBeiGouMaiS,jdbcType=VARCHAR}, #{sheBeiYanShou,jdbcType=VARCHAR}, #{zongJiHuaWaiJ,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR},
 		 #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{sheBeiLeiXing,jdbcType=VARCHAR}, #{sheBeiZhuangTa,jdbcType=VARCHAR},
 		 #{sheBeiShiBieH,jdbcType=VARCHAR}, #{xuanZeSheBei,jdbcType=VARCHAR}, #{sheBeiBianHao,jdbcType=VARCHAR},
 		 #{gouJinRiQi,jdbcType=VARCHAR}, #{shiFouXiaoZhun,jdbcType=VARCHAR}, #{gongYingShang,jdbcType=VARCHAR}, #{lianXiFangShi,jdbcType=VARCHAR},
-		 #{beiZhu,jdbcType=BLOB}, #{xiaoZhunYouXia,jdbcType=VARCHAR}, #{chuChangRiQi,jdbcType=VARCHAR}, #{sheBeiMingChen,jdbcType=VARCHAR},
+		 #{beiZhu,jdbcType=VARCHAR}, #{xiaoZhunYouXia,jdbcType=VARCHAR}, #{chuChangRiQi,jdbcType=VARCHAR}, #{sheBeiMingChen,jdbcType=VARCHAR},
 		 #{shiFouQiJianH,jdbcType=VARCHAR}, #{yiXiaoRiQi,jdbcType=VARCHAR}, #{heChaXiaoZhun,jdbcType=VARCHAR}, #{ceLiangGongZuo,jdbcType=VARCHAR},
 		 #{shiJiShiYongF,jdbcType=VARCHAR}, #{jianDingXiaoZh,jdbcType=VARCHAR}, #{jianDingXiao,jdbcType=VARCHAR}, #{kaiShiShiYong,jdbcType=VARCHAR},
 		 #{zhengShuBianHa,jdbcType=VARCHAR}, #{xiaoZhunWuCha,jdbcType=VARCHAR}, #{xiuZhengZhiXiu,jdbcType=VARCHAR}, #{xiaoZhunZQ,jdbcType=VARCHAR},
-		 #{zuiDaYunCha,jdbcType=VARCHAR}, #{caiGouHeTong,jdbcType=BLOB}, #{faPiao,jdbcType=BLOB}, #{yuanSheBeiBian,jdbcType=VARCHAR}, #{buMen,jdbcType=VARCHAR},
+		 #{zuiDaYunCha,jdbcType=VARCHAR}, #{caiGouHeTong,jdbcType=VARCHAR}, #{faPiao,jdbcType=VARCHAR}, #{yuanSheBeiBian,jdbcType=VARCHAR}, #{buMen,jdbcType=VARCHAR},
 		 #{jianKongYiJu,jdbcType=VARCHAR}, #{biXuDeHuanJin,jdbcType=VARCHAR}, #{biXuSheShi,jdbcType=VARCHAR}, #{ziChanYuanZhi,jdbcType=VARCHAR},
 		 #{ziChanBianHao,jdbcType=VARCHAR}, #{shiYongKeShi,jdbcType=VARCHAR}, #{zhuangTaiFenXi,jdbcType=VARCHAR}, #{shiFouWeiHu,jdbcType=VARCHAR},
-		 #{weiHuZhouQi,jdbcType=VARCHAR}, #{shiWuShuoMing,jdbcType=BLOB}, #{cunFangWeiZhi,jdbcType=VARCHAR}, #{wenDuYingYong,jdbcType=VARCHAR},
+		 #{weiHuZhouQi,jdbcType=VARCHAR}, #{shiWuShuoMing,jdbcType=VARCHAR}, #{cunFangWeiZhi,jdbcType=VARCHAR}, #{wenDuYingYong,jdbcType=VARCHAR},
 		 #{shiDuYingYong,jdbcType=VARCHAR}, #{jiShenXuHao,jdbcType=VARCHAR}, #{yanShouRiQi,jdbcType=VARCHAR}, #{huanJingYaoQiu,jdbcType=VARCHAR},
-		 #{dianYuanYaoQiu,jdbcType=VARCHAR}, #{fuJianShang,jdbcType=BLOB}, #{zhuCeZhengHao,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR},
+		 #{dianYuanYaoQiu,jdbcType=VARCHAR}, #{fuJianShang,jdbcType=VARCHAR}, #{zhuCeZhengHao,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR},
 		 #{diDian,jdbcType=VARCHAR}, #{wenJianXiLei,jdbcType=VARCHAR}, #{xiLeiId,jdbcType=VARCHAR}, #{quanXianLeiXin,jdbcType=VARCHAR},
-		 #{fuZeRenDianHua,jdbcType=VARCHAR}, #{changJiaLianXiRen,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
+		 #{remark,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="EquipmentCardPo">
@@ -156,7 +156,7 @@
 	<select id="query" parameterType="java.util.Map" resultMap="EquipmentCardPo">
 		<include refid="querySql"/>
 	</select>
-	
+
 	<select id="queryIds" parameterType="java.util.Map" resultMap="EquipmentCardPo">
 		SELECT ID_ FROM (<include refid="querySql"/>) T
 	</select>
@@ -191,7 +191,7 @@
 		GUAN_LI_REN_=#{guanLiRen,jdbcType=VARCHAR},
 		WEI_HU_FANG_SHI_=#{weiHuFangShi,jdbcType=VARCHAR},
 		JZFS=#{jzfs,jdbcType=VARCHAR},
-		YQZP=#{yqzp,jdbcType=BLOB},
+		YQZP=#{yqzp,jdbcType=VARCHAR},
 		SHE_BEI_GOU_MAI_S=#{sheBeiGouMaiS,jdbcType=VARCHAR},
 		SHE_BEI_YAN_SHOU=#{sheBeiYanShou,jdbcType=VARCHAR},
 		ZONG_JI_HUA_WAI_J=#{zongJiHuaWaiJ,jdbcType=VARCHAR},
@@ -208,7 +208,7 @@
 		SHI_FOU_XIAO_ZHUN=#{shiFouXiaoZhun,jdbcType=VARCHAR},
 		GONG_YING_SHANG_=#{gongYingShang,jdbcType=VARCHAR},
 		LIAN_XI_FANG_SHI_=#{lianXiFangShi,jdbcType=VARCHAR},
-		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
+		BEI_ZHU_=#{beiZhu,jdbcType=VARCHAR},
 		XIAO_ZHUN_YOU_XIA=#{xiaoZhunYouXia,jdbcType=VARCHAR},
 		CHU_CHANG_RI_QI_=#{chuChangRiQi,jdbcType=VARCHAR},
 		SHE_BEI_MING_CHEN=#{sheBeiMingChen,jdbcType=VARCHAR},
@@ -225,8 +225,8 @@
 		XIU_ZHENG_ZHI_XIU=#{xiuZhengZhiXiu,jdbcType=VARCHAR},
 		XIAO_ZHUN_Z_Q_=#{xiaoZhunZQ,jdbcType=VARCHAR},
 		ZUI_DA_YUN_CHA_=#{zuiDaYunCha,jdbcType=VARCHAR},
-		CAI_GOU_HE_TONG_=#{caiGouHeTong,jdbcType=BLOB},
-		FA_PIAO_=#{faPiao,jdbcType=BLOB},
+		CAI_GOU_HE_TONG_=#{caiGouHeTong,jdbcType=VARCHAR},
+		FA_PIAO_=#{faPiao,jdbcType=VARCHAR},
 		YUAN_SHE_BEI_BIAN=#{yuanSheBeiBian,jdbcType=VARCHAR},
 		BU_MEN_=#{buMen,jdbcType=VARCHAR},
 		JIAN_KONG_YI_JU_=#{jianKongYiJu,jdbcType=VARCHAR},
@@ -238,7 +238,7 @@
 		ZHUANG_TAI_FEN_XI=#{zhuangTaiFenXi,jdbcType=VARCHAR},
 		SHI_FOU_WEI_HU_=#{shiFouWeiHu,jdbcType=VARCHAR},
 		WEI_HU_ZHOU_QI_=#{weiHuZhouQi,jdbcType=VARCHAR},
-		SHI_WU_SHUO_MING_=#{shiWuShuoMing,jdbcType=BLOB},
+		SHI_WU_SHUO_MING_=#{shiWuShuoMing,jdbcType=VARCHAR},
 		CUN_FANG_WEI_ZHI_=#{cunFangWeiZhi,jdbcType=VARCHAR},
 		WEN_DU_YING_YONG_=#{wenDuYingYong,jdbcType=VARCHAR},
 		SHI_DU_YING_YONG_=#{shiDuYingYong,jdbcType=VARCHAR},
@@ -246,15 +246,13 @@
 		YAN_SHOU_RI_QI_=#{yanShouRiQi,jdbcType=VARCHAR},
 		HUAN_JING_YAO_QIU=#{huanJingYaoQiu,jdbcType=VARCHAR},
 		DIAN_YUAN_YAO_QIU=#{dianYuanYaoQiu,jdbcType=VARCHAR},
-		FU_JIAN_SHANG=#{fuJianShang,jdbcType=BLOB},
+		FU_JIAN_SHANG=#{fuJianShang,jdbcType=VARCHAR},
 		ZHU_CE_ZHENG_HAO_=#{zhuCeZhengHao,jdbcType=VARCHAR},
 		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
 		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
 		WEN_JIAN_XI_LEI_=#{wenJianXiLei,jdbcType=VARCHAR},
 		XI_LEI_ID_=#{xiLeiId,jdbcType=VARCHAR},
 		QUAN_XIAN_LEI_XIN=#{quanXianLeiXin,jdbcType=VARCHAR},
-		FU_ZE_REN_DIAN_HU=#{fuZeRenDianHua,jdbcType=VARCHAR},
-		CHANG_JIA_LIAN_XI=#{changJiaLianXiRen,jdbcType=VARCHAR},
 		REMARK_=#{remark,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}