From 55546dfc80bd2ec1be8786b19f53df4e1c1e44e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:49:47 +0800
Subject: [PATCH] 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 f39fd23..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
  */
 
@@ -74,9 +74,13 @@
     private String avatar;
 
     /** 瀵嗙爜 */
+    private String password;
+
     @JsonIgnore
     @JsonProperty
-    private String password;
+    public String getPassword() {
+        return password;
+    }
 
     /** 鐩愬姞瀵� */
     private String salt;
@@ -98,6 +102,7 @@
     private Date loginDate;
 
     /** 鍒涘缓鑰� */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /** 鍒涘缓鏃堕棿 */
@@ -106,6 +111,7 @@
     private Date createTime;
 
     /** 鏇存柊鑰� */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /** 鏇存柊鏃堕棿 */
@@ -142,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