修复合并

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -225,10 +225,6 @@ public interface VehicleFeign {
     @GetMapping("/branchCompany/compnays_area")
     public List<BranchCompanyAreaDTO> findBranchCompnayAreaByIds(@RequestParam("companyIds") List<Integer> compnayIds);
 
-    @GetMapping(value = "/vehicleHolidayPriceInfo/getByVehicleIdFeign")
-    public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getByVehicleIdFeign(
-            @RequestParam("vehicleId") String vehicleId, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("userId") Integer userId, @RequestParam("companyId") Integer companyId);
-
     @ApiOperation("列表")
     @RequestMapping(value = "company/info/app/unauth/listByIds", method = RequestMethod.POST)
     ObjectRestResponse<List<CompanyInfo>> listByIds(@RequestBody CompanyInfoFindDTO companyInfoFindDTO);