Merge branch 'master-tiande' into dev-tiande

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

@@ -95,15 +95,15 @@
         - unix_timestamp(vehicle_departure_log.departure_time)) MOD
         86400/3600,(unix_timestamp(vehicle_departure_log.arrival_time) -
         unix_timestamp(vehicle_departure_log.departure_time))/3600)),0),'小时')
-        as departureDay,bc.name as departureName,bc1.name as arrivalName,bc2.name as expectArrivalName,bc3.name as subordinateName,
+        as departureDay,bc.name as departureName,bc1.name as arrivalName,bc3.name as expectArrivalName,bc4.name as subordinateName,
         IF((IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0))>0,IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0),0)
         as mileage
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
         LEFT JOIN branch_company bc ON vehicle_departure_log.departure_branch_company_id = bc.id
         LEFT JOIN branch_company bc1 ON vehicle_departure_log.arrival_branch_company_id = bc1.id
-        LEFT JOIN branch_company bc2 ON vehicle_departure_log.expect_arrival_branch_company_id = bc2.id
-        LEFT JOIN branch_company bc3 ON vehicle.subordinate_branch = bc3.id
+        LEFT JOIN branch_company bc3 ON vehicle_departure_log.expect_arrival_branch_company_id = bc3.id
+        LEFT JOIN branch_company bc4 ON vehicle.subordinate_branch = bc4.id
         LEFT JOIN vehicle_book_record bc2 ON vehicle_departure_log.book_record_id = bc2.id
         <trim prefix="where">
             1=1