From 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 09:50:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 19 ++++++++++++++++---
1 files changed, 16 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 25d915e..2f8fed1 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,8 +15,11 @@
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;
+import java.util.Map;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -28,7 +31,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user")
-public class SysUser
+public class SysUser implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -70,10 +73,14 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
- /** 瀵嗙爜 */
- @JsonIgnore
+ /** 瀵嗙爜 */
@JsonProperty
private String password;
+
+ @JsonIgnore
+ public String getPassword() {
+ return password;
+ }
/** 鐩愬姞瀵� */
private String salt;
@@ -113,6 +120,12 @@
/** 澶囨敞 */
private String remark;
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
/** 閮ㄩ棬瀵硅薄 */
@Excels({
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
--
Gitblit v1.9.3