Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -507,7 +507,7 @@
                 and book_end_date >= now()
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间后两天的不显示-->
-            <if test="flag == true and (status == 2 || status == 3 || status == 5)">
+            <if test="flag == true and status == 2">
                 and ((v4.id is not NULL and v1.book_end_date &gt;= DATE_ADD(NOW(),interval '2 00:00:00' DAY_SECOND)) or
                 (v4.id is NULL and v1.book_end_date &gt;= now()))
             </if>