代码合并错误

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

@@ -626,13 +626,4 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/staffrole/queryRoleStaffIds")
     Result<Set<String>> queryRoleStaffIds(@RequestBody RoleStaffIdFormDTO formDTO);
-
-    /**
-     * @Description  查询巡查人数
-     * @Param formDTO
-     * @author zxc
-     * @date 2021/8/20 10:21 上午
-     */
-    @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolcount")
-    Result<PatrolCountResultDTO> patrolCount(@RequestBody PatrolCountFormDTO formDTO);
 }

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

@@ -445,9 +445,4 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<Set<String>> queryRoleStaffIds(RoleStaffIdFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryRoleStaffIds", formDTO);
     }
-
-    @Override
-    public Result<PatrolCountResultDTO> patrolCount(PatrolCountFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolCount", formDTO);
-    }
 }