Merge branch 'master-tiande' into dev-tiande

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

@@ -23,9 +23,9 @@
             </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>
+                <association column="detail_id" property="orderActivityDetail"
+                             select="com.xxfc.platform.order.mapper.OrderActivityDetailMapperr.selectByPrimaryKey"
+                             javaType="com.xxfc.platform.order.entity.OrderActivityDetail"></association>
             </case>
         </discriminator>
     </resultMap>