Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java

@@ -93,7 +93,8 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         vehicleWarnChild.setArriveSendExpectTime(arriveSendExpectTime==0? null : arriveSendExpectTime);
         vehicleWarnChild.setArriveReceiveExpectTime(arriveReceiveExpectTime==0? null : arriveReceiveExpectTime);
 
-        vehicleWarnChild.setTraceTime(orderChild.getPayTime());
+        vehicleWarnChild.setTakeTime(orderChild.getPayTime());
+        vehicleWarnChild.setTraceTime(LocalDateTime.now());
 
         vehicleWarnChildDao.saveEntity(vehicleWarnChild);
     }