Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -181,7 +181,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 >= unix_timestamp(now())
+        where b.type = 1 and r.end_time >= unix_timestamp(now())*1000
         <if test="userIds != null and userIds.size > 0">
             and b.user_id in
             <foreach collection="userIds" item="id" open="(" separator="," close=")">