From 0e723a802df3d24d96f72eff8e57521e852e6b8c Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 11 Aug 2021 14:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=86=85=E5=AE=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/ModuleOption.java | 16 +++++++++
 .../elink/esua/epdc/dto/ModuleOptionDTO.java  | 33 +++++++++++++++++++
 .../com/elink/esua/epdc/dto/NoticeDTO.java    | 11 +++++--
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
 create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java

diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
new file mode 100644
index 0000000..2efabca
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
@@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 栏目节点
+ *
+ */
+@Data
+public class ModuleOption<T> {
+
+    private List<T> moduleOptions;
+
+}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
new file mode 100644
index 0000000..7a8ec90
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-10 14:49
+ **/
+@Data
+public class ModuleOptionDTO extends TreeNode implements Serializable {
+
+    private Long id;
+
+    private Long pid;
+
+    /**
+     * 栏目名称
+     */
+    private String label;
+
+    /**
+     *栏目id
+     */
+    private Long value;
+
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
index ef3af0a..bbbd9a2 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
@@ -141,9 +141,14 @@ public class NoticeDTO implements Serializable {
     private String extendFlag;
 
     /**
-     * 类别编码
+     * 栏目id
      */
-    private String typeCode;
+    private String typeId;
+
+    /**
+     * 所有栏目id
+     */
+    private List<String> allTypeId;
 
     /**
      * 置顶标识 0-否，1-是
@@ -155,4 +160,6 @@ public class NoticeDTO implements Serializable {
      */
     private String noticeUpDownState;
 
+    private String typeName;
+
 }
\ No newline at end of file