Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/chint/application/queryies/OrderDetailQuery.java

@@ -193,6 +193,7 @@ public class OrderDetailQuery {
             CarOrderDetailDto orderDetailDto = CarOrderDetailDto.copyFrom(carOrderDetail);
             RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
             orderDetailDto.setApplicantId(routeOrder.getUserId());
+            orderDetailDto.setMiles(carOrderDetail.getMileage());//打车里程数映射
             return orderDetailDto;
         }
         return null;

src/main/java/com/chint/interfaces/rest/bpm/dto/orderdetail/CarOrderDetailDto.java

@@ -88,6 +88,9 @@ public class CarOrderDetailDto implements Serializable {
     // 里程数
     private String mileage;
 
+    // 打车的里程数
+    private String miles;
+
     // 订单总额(含前收服务费)
     private String orderAmount;