修改

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -353,5 +353,5 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
     // 通过运单下的物资信息
     int closeInwardOrderByPlan(BigDecimal bigDecimal);
->>>>>>> d53c1c0a3177870b86ae0684d6cb20ac4c5f6eed
+
 }