Browse Source

Merge branch 'yantai_zhengwu_master'

master
lichao 2 years ago
parent
commit
e6d59ed8b0
  1. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseLangchaoListResultDTO.java
  2. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_langchao.xlsx
  3. 6
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiLangchaoListResultDTO.java
  4. BIN
      epmet-user/epmet-user-server/src/main/resources/excel/resi_export_for_langchao.xlsx

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseLangchaoListResultDTO.java

@ -16,7 +16,6 @@ public class HouseLangchaoListResultDTO implements Serializable {
private static final long serialVersionUID = 4963952996288796744L;
private Integer seqNo;
private String areaName;
@ -41,7 +40,7 @@ public class HouseLangchaoListResultDTO implements Serializable {
private String dwellingState;
private String usage;
/*
private String createTime;
private String updateTime;
@ -54,7 +53,7 @@ public class HouseLangchaoListResultDTO implements Serializable {
private String custKey;
private String fullName;
private String fullName;*/

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_langchao.xlsx

Binary file not shown.

6
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiLangchaoListResultDTO.java

@ -19,7 +19,7 @@ public class ResiLangchaoListResultDTO implements Serializable {
private static final long serialVersionUID = 4963952996288796744L;
private Integer seqNo;
// private Integer seqNo;
private String areaName;
@ -101,7 +101,7 @@ public class ResiLangchaoListResultDTO implements Serializable {
private String remark;
private Date createTime;
/* private Date createTime;
private Date updateTime;
@ -111,5 +111,5 @@ public class ResiLangchaoListResultDTO implements Serializable {
private String orgKey;
private String custKey;
private String custKey;*/
}

BIN
epmet-user/epmet-user-server/src/main/resources/excel/resi_export_for_langchao.xlsx

Binary file not shown.
Loading…
Cancel
Save