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

@@ -506,13 +506,13 @@
             <if test="flag == true and status == 1">
                 and book_end_date &gt;= now()
             </if>
-            <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间后两天的不显示-->
+            <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
             <if test="flag == true and status == 2">
                and (
-                (v4.id IS NOT NULL  AND DATE_ADD( v1.book_end_date, INTERVAL '2 00:00:00' DAY_SECOND ) >= NOW())
+                (v4.id IS NOT NULL  AND DATE_ADD( v1.book_end_date, INTERVAL '2 00:00:00' DAY_SECOND ) &gt;= NOW())
                 OR (
                 v4.id IS NULL
-                AND v1.book_end_date >= now()
+                AND v1.book_end_date &gt;= now()
                 ))
             </if>
             and v1.book_user != -2

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

@@ -150,8 +150,7 @@
             </foreach>
         </if>
         <if test="subordinateBranch !=null ">
-            and ( v.park_branch_company_id = #{subordinateBranch} or
-            v.expect_destination_branch_company_id=#{subordinateBranch} )
+            and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
                 <if test="addrProvince !=null">