Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java

@@ -130,5 +130,5 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	/**
 	 * 居住人数
 	 */
-	private String resiNumber;
+	private Integer resiNumber;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -131,5 +131,5 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	/**
 	 * 居住人数
 	 */
-	private String resiNumber;
+	private Integer resiNumber;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql

@@ -0,0 +1 @@
+alter table ic_house modify RESI_NUMBER int(2) default 0;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -24,6 +24,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="resiNumber" column="RESI_NUMBER"/>
     </resultMap>
 
     <!-- 批量更新房屋信息 -->