-
周健威 authored# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java # xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/SysRegionController.java
06d66466