wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!23 同步dev 

Merge pull request !23 from 疯狂的狮子li/dev
This commit is contained in:
疯狂的狮子li 2021-04-23 16:00:06 +08:00 committed by Gitee
parent 1bef814c51 734073019f
commit b222c4215b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* *
* @author ruoyi * @author ruoyi
*/ */
@ -73,11 +73,11 @@ public class SysUser implements Serializable
/** 用户头像 */ /** 用户头像 */
private String avatar; private String avatar;
/** 密码 */ /** 密码 */
@JsonProperty
private String password; private String password;
@JsonIgnore @JsonIgnore
@JsonProperty
public String getPassword() { public String getPassword() {
return password; return password;
} }