冲突

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -121,8 +121,6 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "statisticsTruckMonth")
     MonthInComeAndOrderedVO statisticsTruckMonth(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime,  @Param("truckNo")String truckNo);
-                          Integer sendSystemAddressId, Integer receiveSystemAddressId,
-                          String beginTime);
 
     @Select("select sum(if (status>=50, load_net, #{defaultWeight})) from order_child " +
             " where order_goods_no=#{orderGoodsNo} and status in(10,20,30,40,50,60,70,80,90,100)")