王鑫 2b159662db Merge remote-tracking branch 'origin/dev.gateway' into dev.gateway ... # Conflicts: # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/vehicle/model/VehicleData.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/vehicle/thread/VehicleThread.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/web/domain/VehicleInfo.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/web/domain/model/PositionModel.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/web/mapper/VehicleInfoMapper.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/web/service/impl/VechileInfoServiceImpl.java # cloud-modules/cloud-modules-vehicle-gateway/src/main/java/com/muyu/vehicleGateway/web/util/VehicleUtils.java		2024-10-07 20:41:04 +08:00
..
src/main	Merge remote-tracking branch 'origin/dev.gateway' into dev.gateway	2024-10-07 20:41:04 +08:00
pom.xml	Merge remote-tracking branch 'origin/dev.gateway' into dev.gateway	2024-10-07 20:41:04 +08:00