Merge branch 'master-bg-update' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

@@ -35,4 +35,6 @@ public class BgOrderListVo {
 	private BigDecimal realAmount;
 	//支付方式
 	private Integer payWay;
+	//订单详情ID
+	private Integer detailId;
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -255,7 +255,8 @@
         o1.start_time as startTime,
         o1.end_time as endTime,
         b1.real_amount as realAmount,
-        b1.pay_way as payWay
+        b1.pay_way as payWay,
+        o1.id as detailId
         FROM
         base_order b1
         LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id