Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 80b0f1c692a3ecbe46f1dad59d8924bd7b09b148

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

@@ -74,6 +74,14 @@
    R<SysUser>  queryUserByUserName(@RequestBody String userName);
    
    /**
     * 通过账号和账号权限查询用户
     * @param userName
     * @return
     */
    @PostMapping("/user/queryUserByUserNameAndRoleType")
    R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("userName") String userName, @RequestParam("roleType") Integer roleType);
    
    /**
     * 新增加用户信息
     * @param user
     */
@@ -104,7 +112,7 @@
     * @param roleType
     * @return
     */
    @PostMapping("/user/delShopUser")
    @PostMapping("/user/user/delShopUser")
    R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType);