Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2021-04-25 91c6ae307de58c5fcbf815f92a90295b4246cd51

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

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

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

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