Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-26 6f97a42dccaedb7a8950feac205080e63d8be439

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -192,7 +192,9 @@
        }

        user.setUpdateBy(getUsername());
        if(StringUtils.isNotEmpty(user.getPassword())){
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        }
        return AjaxResult.success(userService.updateUser(user));
    }