Merge branch 'master-bug-new' into dev

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

@@ -535,7 +535,7 @@
             </if>
             <!--增加时间限制，已审核的未出车结束时间小于当前时间的不显示-->
             <if test="flag == true and (status == 3 or status == 2)">
-                and (v4.id IS NULL AND v1.book_end_date &gt;= now()))
+                and v4.id IS NULL AND v1.book_end_date &gt;= now()
             </if>
             <if test="flag == true">
                 and v1.book_user != -2