Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
This commit is contained in:
commit
5b4e9ef4db
|
@ -74,10 +74,14 @@ public class SysUser implements Serializable
|
||||||
private String avatar;
|
private String avatar;
|
||||||
|
|
||||||
/** 密码 */
|
/** 密码 */
|
||||||
@JsonIgnore
|
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public String getPassword() {
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
/** 盐加密 */
|
/** 盐加密 */
|
||||||
private String salt;
|
private String salt;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue