From 9a26a3c4e81dad23f73a0481916d3049700c6592 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 21:14:48 +0800
Subject: [PATCH] !22 同步 master Merge pull request !22 from 疯狂的狮子li/master
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 13 ++++++++++---
1 files changed, 10 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..57e46fc 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;
@@ -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;
@@ -72,10 +73,14 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
- /** 瀵嗙爜 */
- @JsonIgnore
+ /** 瀵嗙爜 */
@JsonProperty
private String password;
+
+ @JsonIgnore
+ 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;
/** 鏇存柊鏃堕棿 */
--
Gitblit v1.9.3