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 | 17 ++++++++++++++---
1 files changed, 14 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 73a0561..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
@@ -15,6 +15,7 @@
import javax.validation.constraints.Email;
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.List;
@@ -22,7 +23,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
@@ -30,7 +31,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user")
-public class SysUser
+public class SysUser implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -73,9 +74,13 @@
private String avatar;
/** 瀵嗙爜 */
+ private String password;
+
@JsonIgnore
@JsonProperty
- private String password;
+ public String getPassword() {
+ return password;
+ }
/** 鐩愬姞瀵� */
private String salt;
@@ -97,6 +102,7 @@
private Date loginDate;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -105,6 +111,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@@ -141,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