Merge branch 'master' into dev

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

@@ -871,7 +871,7 @@
                         bc.id = #{parkBranchCompanyId}
                     </otherwise>
                 </choose>
-            where vm.isdel = 0 and vm.status = 0)
+            where vm.isdel = 0 and vm.status = 0 and vm.app_show = 1)
         </if>
         <if test="lon != null and lat != null">
             order by