From c17ee7624b28485794e956a17631ce2d41a623ff Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 09:05:22 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java |   27 ++++-----------------------
 1 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 64de41c..4c8f0ed 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -5,18 +5,16 @@
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.factory.SysUserFallbackFactory;
-import com.ruoyi.system.api.model.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+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 javax.management.relation.Role;
 import java.util.List;
 
 @FeignClient(contextId = "sysUserClient", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = SysUserFallbackFactory.class)
 public interface SysUserClient {
-
-    @PostMapping("/user/getSysUserFromCompanyId")
-    R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq);
 
     @PostMapping("/user/getSysUser")
     R<SysUser> getSysUser(@RequestParam("userId")Long userId);
@@ -24,18 +22,9 @@
     @PostMapping("/user/updateSysUser")
     R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
 
-    @PostMapping("/user/companySaveSysUser")
-    R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
-
-    @PostMapping("/user/addTRepairSysUser")
-    R<List<Integer>> addTRepairSysUser(@RequestBody TRepairShopAddDto dto);
-
     @PostMapping("/user/getUserList")
     R<List<SysUser>> getUserList(@RequestBody List<Integer> userIds);
 
-
-    @PostMapping("/user/getSysUserFromCompanyIdOne")
-    R<List<CompanyUserListVo>> getSysUserFromCompanyIdOne(@RequestBody CompanySysUserReq companySysUserReq);
 
     @PostMapping("/user/isAdmin")
     R<Integer> isAdmin(Long userId);
@@ -67,14 +56,6 @@
      */
     @PostMapping("/user/queryUserByPhoneList")
     R<List<SysUser>>  queryUserByPhoneList(@RequestBody List<String> phoneList);
-
-    /**
-     * 默认批量添加修理厂
-     * @param dtoList
-     * @return
-     */
-    @PostMapping("/user/addUserRole")
-    R<Boolean>  addUserRole(@RequestBody List<SysUserRoleDTO> dtoList);
 
     /**
      * 通过手机号查询用户

--
Gitblit v1.7.1