解决冲突

performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java

@@ -4,6 +4,7 @@ import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.param.temp.DriverTraceAddParam;
 import com.clx.performance.param.temp.TruckTraceAddParam;
+import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.gd.GdService;