From a48154a2ee94c9346309af1a9e270e47b6d9eb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Wed, 11 Aug 2021 15:43:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A1=A5=E5=85=A8=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=20=E6=96=87=E6=A1=A3=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/BaseEntity.java  | 56 +++++++----
 .../ruoyi/common/core/domain/TreeEntity.java  | 94 +++++++++++--------
 2 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index d66686be..72d624a9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -18,29 +19,50 @@ import java.util.Map;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-public class BaseEntity implements Serializable
-{
-    private static final long serialVersionUID = 1L;
+public class BaseEntity implements Serializable {
 
-    /** 搜索值 */
-    private String searchValue;
+	private static final long serialVersionUID = 1L;
 
-    /** 创建者 */
-    private String createBy;
+	/**
+	 * 搜索值
+	 */
+	@ApiModelProperty(value = "搜索值")
+	private String searchValue;
 
-    /** 创建时间 */
-    private Date createTime;
+	/**
+	 * 创建者
+	 */
+	@ApiModelProperty(value = "创建者")
+	private String createBy;
 
-    /** 更新者 */
-    private String updateBy;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
 
-    /** 更新时间 */
-    private Date updateTime;
+	/**
+	 * 更新者
+	 */
+	@ApiModelProperty(value = "更新者")
+	private String updateBy;
 
-    /** 备注 */
-    private String remark;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
 
-    /** 请求参数 */
-    private Map<String, Object> params = new HashMap<>();
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	/**
+	 * 请求参数
+	 */
+	@ApiModelProperty(value = "请求参数")
+	private Map<String, Object> params = new HashMap<>();
 
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index 2569fac2..8db10aa2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -1,38 +1,56 @@
-package com.ruoyi.common.core.domain;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Tree基类
- * 
- * @author ruoyi
- */
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class TreeEntity extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 父菜单名称 */
-    private String parentName;
-
-    /** 父菜单ID */
-    private Long parentId;
-
-    /** 显示顺序 */
-    private Integer orderNum;
-
-    /** 祖级列表 */
-    private String ancestors;
-
-    /** 子部门 */
-    private List<?> children = new ArrayList<>();
-
-}
+package com.ruoyi.common.core.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tree基类
+ *
+ * @author ruoyi
+ */
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TreeEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 父菜单名称
+	 */
+	@ApiModelProperty(value = "父菜单名称")
+	private String parentName;
+
+	/**
+	 * 父菜单ID
+	 */
+	@ApiModelProperty(value = "父菜单ID")
+	private Long parentId;
+
+	/**
+	 * 显示顺序
+	 */
+	@ApiModelProperty(value = "显示顺序")
+	private Integer orderNum;
+
+	/**
+	 * 祖级列表
+	 */
+	@ApiModelProperty(value = "祖级列表")
+	private String ancestors;
+
+	/**
+	 * 子部门
+	 */
+	@ApiModelProperty(value = "子部门")
+	private List<?> children = new ArrayList<>();
+
+}