Merge branch 'master-vehicle-price' into dev-tiande

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

@@ -1189,7 +1189,7 @@
 
             <if test=" yearNo4Where != null and recordIntersection != null and recordIntersection == true">
                 <!-- 1、最后还车时间(天) 大于 最早提车时间(天)  并且多于一天-->
-                and if((abr.to_lift_must_after_date == null or abr.to_return_must_before_date == null), true
+                and if((abr.to_lift_must_after_date is null or abr.to_return_must_before_date is null), true
                     , (str_to_date(DATE_FORMAT(abr.to_return_must_before_date,'%Y-%m-%d'),'%Y-%m-%d %H:%i:%s')
                         >  DATE_ADD(DATE_ADD(str_to_date(DATE_FORMAT(abr.to_lift_must_after_date,'%Y-%m-%d'),'%Y-%m-%d %H:%i:%s'),INTERVAL 2 DAY),INTERVAL -1 SECOND))
                 )