Merge branch 'master-tiande' into dev-tiande

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

@@ -977,7 +977,7 @@
                 and v2.model_id = #{modelId}
             </if>
              <if test="parkBranchCompanyId != null and parkBranchCompanyId > 0">
-                and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}or bc4.id = #{parkBranchCompanyId})
+                and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}  or bc4.id = #{parkBranchCompanyId})
             </if>
             <if test="branchId != null and branchId > 0">
                 and (bc2.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})