diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java index 757def979a..c098192f01 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 7c8eeee13d..25a02ec5fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql new file mode 100644 index 0000000000..32da1ee720 --- /dev/null +++ b/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; \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index c750f98353..c6c371a095 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -24,6 +24,7 @@ +