Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 d0e96daddf8d06900c468ee71a8ee4f14fc1c980

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

@@ -110,9 +110,4 @@
     */
    @PostMapping("/user/resetPassword")
    R resetPassword(@RequestBody SysUser user);
    
    
    
    @PostMapping("/user/getSysUserById")
    SysUser getSysUserById(Long userId);
}