Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-09 a3ded5d8e0c4f750fb4ad190e165ddeb8446f05a

 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;