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/SysRole.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 4ada2c2..ba89bec 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -10,7 +10,10 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 瑙掕壊琛� sys_role
@@ -22,7 +25,7 @@
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_role")
-public class SysRole
+public class SysRole implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
@@ -85,6 +88,12 @@
     /** 澶囨敞 */
     private String remark;
 
+    /**
+     * 璇锋眰鍙傛暟
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
     /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */
     @TableField(exist = false)
     private boolean flag = false;

--
Gitblit v1.9.3