From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 80 +++++++++++----------------------------
1 files changed, 23 insertions(+), 57 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 62056e0..17ff660 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -1,48 +1,44 @@
package com.ruoyi.common.core.domain.entity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.TreeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
/**
* 閮ㄩ棬琛� sys_dept
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dept")
-public class SysDept implements Serializable {
+@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
+public class SysDept extends TreeEntity {
private static final long serialVersionUID = 1L;
/**
* 閮ㄩ棬ID
*/
- @TableId(value = "dept_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableId(value = "dept_id")
private Long deptId;
-
- /**
- * 鐖堕儴闂↖D
- */
- private Long parentId;
-
- /**
- * 绁栫骇鍒楄〃
- */
- private String ancestors;
/**
* 閮ㄩ棬鍚嶇О
*/
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
@NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
private String deptName;
@@ -50,23 +46,27 @@
/**
* 鏄剧ず椤哄簭
*/
+ @ApiModelProperty(value = "鏄剧ず椤哄簭")
@NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private String orderNum;
/**
* 璐熻矗浜�
*/
+ @ApiModelProperty(value = "璐熻矗浜�")
private String leader;
/**
* 鑱旂郴鐢佃瘽
*/
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
@Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
private String phone;
/**
* 閭
*/
+ @ApiModelProperty(value = "閭")
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String email;
@@ -74,54 +74,20 @@
/**
* 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
*/
+ @ApiModelProperty(value = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
- * 鐖堕儴闂ㄥ悕绉�
+ * 绁栫骇鍒楄〃
*/
- @TableField(exist = false)
- private String parentName;
-
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
- * 瀛愰儴闂�
- */
- @TableField(exist = false)
- private List<SysDept> children = new ArrayList<SysDept>();
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ @ApiModelProperty(value = "绁栫骇鍒楄〃")
+ private String ancestors;
}
--
Gitblit v1.9.3