From c529b80af85190ced72e06b01d9e3d9b01cb152a Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 10 Aug 2021 10:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/ModuleTypeCategoryDTO.java  | 63 +++++++++++++++++++
 .../elink/esua/epdc/dto/ModuleTypeDTO.java    | 32 +++++-----
 2 files changed, 78 insertions(+), 17 deletions(-)
 create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java

diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
new file mode 100644
index 0000000..864a1d9
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
@@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description: 栏目管理树
+ * @author: wangtong
+ * @create: 2021-08-09 16:18
+ **/
+@Data
+public class ModuleTypeCategoryDTO extends TreeNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Null(message = "{id.null}", groups = AddGroup.class)
+    @NotNull(message = "{id.require}", groups = UpdateGroup.class)
+    private Long id;
+
+    /**
+     * 上级分类ID
+     */
+    @NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
+    private Long pid;
+
+    /**
+     * 分类名称
+     */
+    @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
+    private String typeName;
+
+
+    /**
+     * 分类编码
+     */
+    private String typeCode;
+
+    /**
+     * 排序
+     */
+    @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+    private Integer sort;
+
+    private String parentName;
+
+    private String value;
+
+    private String label;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
index 9edb137..1146981 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
@@ -17,16 +17,17 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
  * 模块类别管理
  *
  * @author qu qu@elink-cn.com
- * @since v1.0.0 2021-08-09
+ * @since v1.0.0 2021-08-10
  */
 @Data
 public class ModuleTypeDTO implements Serializable {
@@ -36,12 +37,12 @@ public class ModuleTypeDTO implements Serializable {
     /**
      * 标识号
      */
-	private String id;
+	private Long id;
 
     /**
      * 上级ID
      */
-	private String pid;
+	private Long pid;
 
     /**
      * 所有上级ID 逗号分隔
@@ -69,33 +70,30 @@ public class ModuleTypeDTO implements Serializable {
 	private String bannerFlag;
 
     /**
-     * 删除标识 0-否，1-是
+     * 删除标识  0：未删除    1：删除
      */
-	private String delFlag;
+	private Integer 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;
 
 }
\ No newline at end of file