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 @@ public class SysUser implements Serializable
     private String avatar;
 
        /** 密码 */
-    @JsonIgnore
     @JsonProperty
     private String password;
 
+    @JsonIgnore
+    public String getPassword() {
+        return password;
+    }
+
     /** 盐加密 */
     private String salt;