Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev

疯狂的狮子li

2021-04-22 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1

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

@@ -74,10 +74,14 @@
    private String avatar;

    /** 密码 */
    @JsonIgnore
    @JsonProperty
    private String password;

    @JsonIgnore
    public String getPassword() {
        return password;
    }

    /** 盐加密 */
    private String salt;