# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java