Merge branch 'feature/phaseOne' of http://121.42.41.42:7070/r/epdc-cloud-client-yushan into feature/phaseOne

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;
+
+}

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;
+
+
+
+}

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;
+
 }