Merge remote-tracking branch 'origin/master'

xuhy

2024-08-09 96249691045b3c0ad7858384c16be33d34636a96

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -265,7 +265,7 @@
    {
        this.avatar = avatar;
    }

    
    public String getPassword()
    {
        return password;