passengerInfo增加ticketType。

common/src/main/java/com/jpsoft/bus/modules/bus/dto/PassengerDetailDTO.java

@@ -66,4 +66,6 @@ public class PassengerDetailDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "下车时间")
     private Date downTime;
+
+    private String ticketType;
 }

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -711,6 +711,7 @@ public class DriverApiController {
             passengerDetailDTO.setLocalImageUrl(passengerInfo.getLocalImageUrl());
             passengerDetailDTO.setUpTime(passengerInfo.getUpTime());
             passengerDetailDTO.setUpStationId(passengerInfo.getUpStationId());
+            passengerDetailDTO.setTicketType(passengerInfo.getTicketType());
 
             //上车站点
             StationInfo upStationInfo = stationInfoService.get(passengerInfo.getUpStationId());

web/src/main/resources/application-dev.yml

@@ -7,14 +7,14 @@ spring:
   datasource:
 
     #开发环境
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
 
     #测试环境
-#     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/jp_housekeeper_2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft8121234
 
     #正式环境
 #     url: jdbc:log4jdbc:mysql://122.189.98.152:3336/jp_housekeeper?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8