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

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

@@ -42,7 +42,7 @@
         select DISTINCT v.`id`,
         v.`code`,
         (CASE WHEN #{status} != null THEN #{status}
-        ELSE 0 END) status ,
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
         v.park_branch_company_id,
@@ -180,7 +180,7 @@
         select DISTINCT v.`id`,
         v.`code`,
         (CASE WHEN #{status} != null THEN #{status}
-        ELSE 0 END) status ,
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
         -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,