diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java index 7b9abc9de6..f7380580b4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java @@ -75,7 +75,7 @@ public class CustomerAgencyDTO implements Serializable { /** * 地区编码 */ - private Integer areaCode; + private String areaCode; /** * 删除标识 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index 5549845d66..6a669609eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -75,7 +75,7 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { /** * 地区编码 */ - private Integer areaCode; + private String areaCode; /** * 总人数 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java index 346963be94..7edffbcc60 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java @@ -53,7 +53,7 @@ public class CustomerAgencyExcel { private String level; @Excel(name = "地区编码") - private Integer areaCode; + private String areaCode; @Excel(name = "删除标识") private String delFlag; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql index f4d0e47dc7..aa68f1c8fa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql @@ -110,4 +110,6 @@ ALTER TABLE customer_agency ADD ( PROVINCE VARCHAR (32) DEFAULT NULL COMMENT '省份', CITY VARCHAR (32) DEFAULT NULL COMMENT '城市', DISTRICT VARCHAR (32) DEFAULT NULL COMMENT '区县' -); \ No newline at end of file +); + +ALTER TABLE customer_agency MODIFY AREA_CODE VARCHAR(10) NOT NULL; \ No newline at end of file