!23 同步dev

Merge pull request !23 from 疯狂的狮子li/dev
5 years ago · b222c4215b
parent 1bef814c51 734073019f
commit b222c4215b
1 changed files with 3 additions and 3 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@ -23,7 +23,7 @@ import java.util.Map;

 /**
 * 用户对象 sys_user
- * 
+ *
 * @author ruoyi
 */

@ -73,11 +73,11 @@ public class SysUser implements Serializable
    /** 用户头像 */
    private String avatar;

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

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