# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java