Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml

@@ -251,7 +251,7 @@
             FROM logpm_trunkline_cars_load_scan t1
             LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code
             AND ((t2.warehouse_id IS NOT NULL AND t1.warehouse_id IS NULL)
-            OR(t1.warehouse_id IS NOT NULL = t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
+            OR(t1.warehouse_id IS NOT NULL and t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
             WHERE
             t2.scan_code IS NULL
         ) ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4
@@ -321,7 +321,7 @@
             FROM logpm_trunkline_cars_load_scan t1
             LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code
             AND ((t2.warehouse_id IS NOT NULL AND t1.warehouse_id IS NULL)
-            OR(t1.warehouse_id IS NOT NULL = t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
+            OR(t1.warehouse_id IS NOT NULL and t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
             WHERE
             t2.scan_code IS NULL
         ) ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4
@@ -2789,7 +2789,7 @@
             FROM logpm_trunkline_cars_load_scan t1
             LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code
             AND ((t2.warehouse_id IS NOT NULL AND t1.warehouse_id IS NULL)
-            OR(t1.warehouse_id IS NOT NULL = t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
+            OR(t1.warehouse_id IS NOT NULL and t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
             WHERE
             t2.scan_code IS NULL
             ) ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4
@@ -2900,7 +2900,7 @@
             FROM logpm_trunkline_cars_load_scan t1
             LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code
             AND ((t2.warehouse_id IS NOT NULL AND t1.warehouse_id IS NULL)
-            OR(t1.warehouse_id IS NOT NULL = t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
+            OR(t1.warehouse_id IS NOT NULL and t2.warehouse_id IS NOT NULL AND t1.create_time < t2.create_time))
             WHERE
             t2.scan_code IS NULL
         ) ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4