Merge branch 'feature-vehicle-trip3' into dev

# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/DepartureLogVo.java

@@ -55,4 +55,9 @@ public class DepartureLogVo extends VehicleDepartureLog {
      */
     private  String departureDay;
 
+    /**
+     * 内部用途备注
+     */
+    private  String remark;
+
 }

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

@@ -86,7 +86,7 @@
 
     </select>
     <select id="selectVoAll" resultMap="searchBookRecord">
-        select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,
+        select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,bc2.remark,
          IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0),
         CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) -
         unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',
@@ -134,7 +134,7 @@
         order by create_time desc
     </select>
     <select id="selectVoAllNotAllData" resultMap="searchBookRecord">
-        select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,
+        select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,bc2.remark,
         IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0),
         CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) -
         unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',