Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -383,7 +383,7 @@
         <include refid="searchUsableSql"/>
         and vm.id is not null
         and vm.status = 1
-        and vm.is_del = 0
+        and vm.isdel = 0
         and bc.id is not null
         GROUP BY model_id, company_id
         <if test="lon != null and lat != null">, distance</if>