diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index b6d0585694..0835d6604e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -141,7 +141,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getId()); - dto.setLabel(item.getHouseName()); + dto.setLabel(item.getDoorName()); return dto; }).collect(Collectors.toList()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql new file mode 100644 index 0000000000..28ae0153da --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql @@ -0,0 +1,2 @@ +-- 修改所属家庭项label为户号 +update ic_form_item set LABEL='户号' where LABEL='所属家庭'; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls index 3be61c72ad..99376d01a9 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls differ