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

xuhy

2025-08-27 d4c12b3ad2ae1c052b3b080a68398448e56b619a

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java

@@ -101,7 +101,14 @@
     */
    @PostMapping("/user/resetPassword")
    R resetPassword(@RequestBody SysUser user);
    
    /**
     * 重置站点用户密码
     * @param user
     * @return
     */
    @PostMapping("/user/siteResetPassword")
    R siteResetPassword(@RequestBody SysUser user);

    
    /**
     * 新增加门店员工账号数据