# Conflicts:
#   xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#   xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml