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

@@ -475,12 +475,12 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
-            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">