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

yupeng

2025-02-28 a5f8fdde3b6ef9224a92f39a4a2773ee60460d96

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

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

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