tij

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -496,11 +496,8 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
     Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
 
-<<<<<<< HEAD
     //删除港存堆场
     @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
     Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
-=======
 
->>>>>>> 42a042a9105395a6805599095be5021d55dc41b4
 }