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 | 8 ++++++--
1 files changed, 6 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..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
@@ -73,11 +73,15 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
- /** 瀵嗙爜 */
- @JsonIgnore
+ /** 瀵嗙爜 */
@JsonProperty
private String password;
+ @JsonIgnore
+ public String getPassword() {
+ return password;
+ }
+
/** 鐩愬姞瀵� */
private String salt;
--
Gitblit v1.9.3