解决冲突

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

@@ -154,8 +154,6 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
             "</script>")
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
-                        Integer sendSystemAddressId, Integer receiveSystemAddressId,
-                        String beginTime);
 
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "statisticsTruckMonth")

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java

@@ -39,8 +39,6 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
     @Autowired
     TruckLastPosESPlusMapper truckLastPosESPlusMapper;
 
-    @Autowired
-    private TruckTraceESPlusMapper truckTraceESPlusMapper;
     TruckTraceStruct truckTraceStruct;