解决冲突

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

@@ -5,6 +5,7 @@ import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
 import com.clx.performance.esplus.model.TruckTraceESPlus;
 import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
+import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;