From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 146 +++++++++++++++++++++++++++++-------------------
1 files changed, 87 insertions(+), 59 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 72240bc..62056e0 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,7 +1,6 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -14,7 +13,7 @@
/**
* 閮ㄩ棬琛� sys_dept
- *
+ *
* @author ruoyi
*/
@@ -22,78 +21,107 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dept")
-public class SysDept implements Serializable
-{
- private static final long serialVersionUID = 1L;
+public class SysDept implements Serializable {
+ private static final long serialVersionUID = 1L;
- /** 閮ㄩ棬ID */
- @TableId(value = "dept_id",type = IdType.AUTO)
- private Long deptId;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @TableId(value = "dept_id", type = IdType.AUTO)
+ private Long deptId;
- /** 鐖堕儴闂↖D */
- private Long parentId;
+ /**
+ * 鐖堕儴闂↖D
+ */
+ private Long parentId;
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
+ /**
+ * 绁栫骇鍒楄〃
+ */
+ private String ancestors;
- /** 閮ㄩ棬鍚嶇О */
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- private String deptName;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
+ private String deptName;
- /** 鏄剧ず椤哄簭 */
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private String orderNum;
- /** 璐熻矗浜� */
- private String leader;
+ /**
+ * 璐熻矗浜�
+ */
+ private String leader;
- /** 鑱旂郴鐢佃瘽 */
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- private String phone;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
+ private String phone;
- /** 閭 */
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String email;
+ /**
+ * 閭
+ */
+ @Email(message = "閭鏍煎紡涓嶆纭�")
+ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String email;
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
- private String status;
+ /**
+ * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
+ */
+ private String status;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- @TableLogic
- private String delFlag;
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
+ @TableLogic
+ private String delFlag;
- /** 鐖堕儴闂ㄥ悕绉� */
- @TableField(exist = false)
- private String parentName;
+ /**
+ * 鐖堕儴闂ㄥ悕绉�
+ */
+ @TableField(exist = false)
+ private String parentName;
- /** 鍒涘缓鑰� */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- /** 鍒涘缓鏃堕棿 */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
- /** 鏇存柊鑰� */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
+ /**
+ * 鏇存柊鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- /** 鏇存柊鏃堕棿 */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 瀛愰儴闂� */
- @TableField(exist = false)
- private List<SysDept> children = new ArrayList<SysDept>();
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ /**
+ * 瀛愰儴闂�
+ */
+ @TableField(exist = false)
+ private List<SysDept> children = new ArrayList<SysDept>();
+
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3