From 992a4b60fc24749c9113c5751215592b765c5a80 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 28 Oct 2021 09:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcResiDemandDTO.java   | 24 ++-----------------
 .../com/epmet/entity/IcResiDemandEntity.java  | 19 ++-------------
 .../com/epmet/excel/IcResiDemandExcel.java    | 13 ++--------
 3 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
index c0d6370588..a04efa1096 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
+++ b/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;
-
-    /**
-     * 大类Id
-     */
-	private Date bigClass;
-
-    /**
-     * 大类名称
-     */
-	private Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
+    private String categoryCode;
 
     /**
      * 描述
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
index 6e2b9ac670..fa4da89b59 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
+++ b/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 Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
+	private String categoryCode;
 
     /**
      * 描述
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java
index 8f257a3264..4cf0f37a71 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java
+++ b/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")
-    private Date bigClass;
-
-    @Excel(name = "大类名称")
-    private Date bigClassName;
-
-    @Excel(name = "小类Id")
-    private String smallClass;
-
-    @Excel(name = "小类名称")
-    private String smallClassName;
+    @Excel(name = "需求code")
+    private String categoryCode;
 
     @Excel(name = "描述")
     private String remakes;