-
zuoyh authored
# Conflicts: # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml
31495da2
# Conflicts: # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml