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

无关风月

2025-08-27 e739a69ee991bac72c50bd8c7a00468bcd8039a0

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

@@ -6,10 +6,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

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

    
    /**
     * 新增加门店员工账号数据
@@ -131,4 +135,13 @@
     */
    @PostMapping("/user/delSysUserById")
    R delSysUserById(@RequestParam("userId") Long userId);

    /**
     * 通过站点id查询用户
     * @param siteId
     * @return
     */
    @GetMapping("/user/queryUserBySiteId")
    R<SysUser>  queryUserBySiteId(@RequestParam("siteId")Integer siteId);

}