Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-08-27 e739a69ee991bac72c50bd8c7a00468bcd8039a0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -619,6 +619,15 @@
        userService.resetPwd(user);
        return R.ok();
    }

    @ResponseBody
    @PostMapping("/siteResetPassword")
    public R siteResetPassword(@RequestBody SysUser user) {
        user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5(user.getPassword())));
        user.setUpdateBy(SecurityUtils.getUsername());
        userService.resetPwd(user);
        return R.ok();
    }
    
    
    @ResponseBody