From cfdeada3fdb415ea451fb3fb76b96a2e7977752c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 11:21:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 110c548..a371039 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -62,7 +62,6 @@
     private String email;
 
     /** 鎵嬫満鍙风爜 */
-    @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
     @Excel(name = "鎵嬫満鍙风爜")
     private String phonenumber;
 
@@ -148,6 +147,10 @@
     @TableField(exist = false)
     private Long[] postIds;
 
+	/** 瑙掕壊ID */
+	@TableField(exist = false)
+	private Long roleId;
+
     public SysUser(Long userId)
     {
         this.userId = userId;

--
Gitblit v1.9.3