From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 57e46fc..898138b 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
@@ -23,7 +23,7 @@
 
 /**
  * 鐢ㄦ埛瀵硅薄 sys_user
- * 
+ *
  * @author ruoyi
  */
 
@@ -73,11 +73,11 @@
     /** 鐢ㄦ埛澶村儚 */
     private String avatar;
 
-       /** 瀵嗙爜 */
-    @JsonProperty
+    /** 瀵嗙爜 */
     private String password;
 
     @JsonIgnore
+    @JsonProperty
     public String getPassword() {
         return password;
     }
@@ -148,6 +148,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