Merge branch 'master-order' into dev

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

@@ -18,7 +18,7 @@ public class OrderPageVO extends BaseOrder {
     OrderTourDetail orderTourDetail;
 
     OrderMemberDetail orderMemberDetail;
-
+    OrderActiveDetail orderActiveDetail;
     List<VehicleUserLicense> vehicleUserLicenses;
 
     //更换还车公司记录

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

@@ -21,6 +21,12 @@
                              select="com.xxfc.platform.order.mapper.OrderMemberDetailMapper.selectByPrimaryKey"
                              javaType="com.xxfc.platform.order.entity.OrderMemberDetail"></association>
             </case>
+
+            <case value="4" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
+                <association column="detail_id" property="orderActiveDetail"
+                             select="com.xxfc.platform.order.mapper.OrderActiveDetailMapper.selectByPrimaryKey"
+                             javaType="com.xxfc.platform.order.entity.OrderActiveDetail"></association>
+            </case>
         </discriminator>
     </resultMap>