# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DepositRefundRecord.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

base-dev-merge

See merge request !3

dev-master-merge-190809

See merge request !2