From 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 09:50:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 d082aa9..5bfcb05 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
@@ -9,9 +9,8 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.io.Serializable;
+import java.util.*;
/**
* 閮ㄩ棬琛� sys_dept
@@ -23,7 +22,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dept")
-public class SysDept
+public class SysDept implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -66,6 +65,7 @@
private String delFlag;
/** 鐖堕儴闂ㄥ悕绉� */
+ @TableField(exist = false)
private String parentName;
/** 鍒涘缓鑰� */
@@ -88,4 +88,10 @@
@TableField(exist = false)
private List<SysDept> children = new ArrayList<SysDept>();
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
}
--
Gitblit v1.9.3