冲突

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -273,6 +273,15 @@ public interface UserFeignClient {
      * @param userId
      * @return
      */
-    @GetMapping("app-user/epdc-app/user/partyMemberDetail/{userId}")
-    Result<EpdcPartyMemberDetailDto> partyMemberDetail(@PathVariable("userId") String userId);
+    @GetMapping("app-user/epdc-app/user/partyMemberDetail")
+    Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+    /***
+     * 用户列表
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultFTO>
+     * @author qushutong
+     * @date 2019/11/18 13:47
+     */
+    @GetMapping("app-user/epdc-app/user/list")
+    Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 }