代码冲突

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -191,7 +191,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
 
-    MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
-
     MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
 }