From 2e452ed928d20e63764c80a879514a59838e5a3f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 16 Sep 2021 17:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=A6=81=E6=8F=90=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/suggestion/SuggestionMakeDTO.java     | 12 ++++++++++
 .../dto/suggestion/SuggestionTypeDTO.java     | 24 ++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionMakeDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionMakeDTO.java
index d7f8cad..ba3dd46 100644
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionMakeDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionMakeDTO.java
@@ -19,6 +19,9 @@ package com.elink.esua.epdc.dto.suggestion;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import lombok.Data;
 
 
@@ -153,4 +156,13 @@ public class SuggestionMakeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 创建时间
+     */
+    private String createdTimeStr;
+
+    /**
+     * 建议图片 关联：epdc_custom_img 表；最多三张，逗号分隔
+     */
+    private List<Map<String, String>> suggestionPicList;
 }
diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java
index 4445280..cd53a6c 100644
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java
@@ -35,14 +35,14 @@ import org.apache.poi.ss.formula.functions.T;
  * @since v1.0.0 2021-09-14
  */
 @Data
-public class SuggestionTypeDTO implements Serializable {
+public class SuggestionTypeDTO extends TreeNode implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键
      */
-	private String id;
+	private Long id;
 
     /**
      * 建议类别名称
@@ -52,7 +52,7 @@ public class SuggestionTypeDTO implements Serializable {
     /**
      * 上级ID
      */
-	private String pid;
+	private Long pid;
 
     /**
      * 所有上级ID，用逗号分开
@@ -74,38 +74,28 @@ public class SuggestionTypeDTO implements Serializable {
      */
 	private String delFlag;
 
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
     /**
      * 创建人
      */
-	private String createdBy;
+    private Long creator;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createDate;
 
     /**
      * 更新人
      */
-	private String updatedBy;
+    private Long updater;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updateDate;
 
     /**
      * 上级部门名称
      */
     private String parentName;
-
-    /**
-     * 子节点列表
-     */
-    private List<SuggestionTypeDTO> children = new ArrayList<>();
 }