解决冲突3

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

@@ -349,8 +349,10 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     // 通过运单id或者运单号查询车辆是否放行
     String canCapacityEnfactory(Map<String, Object> mapValue);
+
     // 出库信息
     List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+
     // 通过运单下的物资信息
     int closeInwardOrderByPlan(BigDecimal bigDecimal);