居民需求表结构调整

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java

@@ -44,29 +44,9 @@ public class IcResiDemandDTO implements Serializable {
 	private String customerId;
 
     /**
-     * 主表Id
+     * 需求code【对应ic_resi_demand_dict】
      */
-	private String icResiUser;
+    private String categoryCode;
-
-    /**
-     * 大类Id
-     */
-	private Date bigClass;
-
-    /**
-     * 大类名称
-     */
-	private Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
 
     /**
      * 描述

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java

@@ -49,24 +49,9 @@ public class IcResiDemandEntity extends BaseEpmetEntity {
 	private String icResiUser;
 
     /**
-     * 大类Id
+     * 需求code【对应ic_resi_demand_dict】
      */
-	private Date bigClass;
+	private String categoryCode;
-
-    /**
-     * 大类名称
-     */
-	private Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
 
     /**
      * 描述

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java

@@ -40,17 +40,8 @@ public class IcResiDemandExcel {
     @Excel(name = "主表Id")
     private String icResiUser;
 
-    @Excel(name = "大类Id")
+    @Excel(name = "需求code")
-    private Date bigClass;
+    private String categoryCode;
-
-    @Excel(name = "大类名称")
-    private Date bigClassName;
-
-    @Excel(name = "小类Id")
-    private String smallClass;
-
-    @Excel(name = "小类名称")
-    private String smallClassName;
 
     @Excel(name = "描述")
     private String remakes;