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-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -177,7 +177,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 1 and r.end_time >= now()
+        where b.type = 1 and r.end_time >= unix_timestamp(now())
         <if test="userIds != null and userIds.size > 0">
             and b.user_id in
             <foreach collection="userIds" item="id" open="(" separator="," close=")">
@@ -205,7 +205,6 @@
             <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
-
         </if>
         <if test="status == 4">
             order by r.start_time