Merge branch 'master-vehicle-bg' into dev

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

@@ -593,7 +593,7 @@
     <!--导出分公司停靠所有车辆-->
     <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.VehicleExcelVo">
         select b1.name as parkBranchCompanyName, v1.number_plate as numberPlate, v1.code as code from branch_company b1
-        left join vehicle v1 on v1.park_branch_company_id on b1.id
+        left join vehicle v1 on v1.park_branch_company_id = b1.id
         where b1.is_del = 0 and v1.is_del = 0
     </select>