Merge branch 'master-tiande' into dev-tiande

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

@@ -19,6 +19,8 @@ public class OrderPageVO extends BaseOrder {
 
     OrderMemberDetail orderMemberDetail;
     OrderActiveDetail orderActiveDetail;
+
+    OrderActivityDetail orderActivityDetail;
     List<VehicleUserLicense> vehicleUserLicenses;
 
     //更换还车公司记录

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

@@ -24,7 +24,7 @@
 
             <case value="4" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
                 <association column="detail_id" property="orderActivityDetail"
-                             select="com.xxfc.platform.order.mapper.OrderActivityDetailMapperr.selectByPrimaryKey"
+                             select="com.xxfc.platform.order.mapper.OrderActivityDetailMapper.selectByPrimaryKey"
                              javaType="com.xxfc.platform.order.entity.OrderActivityDetail"></association>
             </case>
         </discriminator>