Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 8bd65ed0eab661b4d76c26650be445686f889ca5

 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("roleType") String userName, @RequestParam("roleType") Integer roleType);
    
    /**
     * 新增加用户信息
     * @param user
     */