合并的错误

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -698,12 +698,4 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
     Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId);
-
-    /**
-     * desc:获取例行工作 数据 分页
-     * @param patrolQueryFormDTO
-     * @return
-     */
-    @PostMapping(value = "//epmetuser/patrolroutinework/selectList")
-    Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -518,8 +518,4 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId);
     }
 
-    @Override
-    public Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(PatrolQueryFormDTO patrolQueryFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkList", patrolQueryFormDTO);
-    }
 }