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 | 15 ++++++++++++---
1 files changed, 12 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 f39fd23..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
@@ -23,7 +23,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
@@ -62,7 +62,6 @@
private String email;
/** 鎵嬫満鍙风爜 */
- @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
@Excel(name = "鎵嬫満鍙风爜")
private String phonenumber;
@@ -74,9 +73,13 @@
private String avatar;
/** 瀵嗙爜 */
+ private String password;
+
@JsonIgnore
@JsonProperty
- private String password;
+ public String getPassword() {
+ return password;
+ }
/** 鐩愬姞瀵� */
private String salt;
@@ -98,6 +101,7 @@
private Date loginDate;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -106,6 +110,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@@ -142,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