Merge branch 'master-modify-cutAmount' into dev

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

@@ -508,7 +508,12 @@
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
             <if test="flag == true and status == 2">
-                and ( v4.id IS NOT NULL  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
+               and (
+<!--                (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 &gt;= now()
+                )
             </if>
             and v1.book_user != -2
         </where>