Skip to content

C
cloud-platform
Commit 5b6c5843 authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'master-tiande' into dev-tiande

parents a1841513 632e7e1a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @ 5b6c5843
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
</case> </case>
<case value="4" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO"> <case value="4" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
<association column="detail_id" property="orderActiveDetail" <association column="detail_id" property="orderActivityDetail"
select="com.xxfc.platform.order.mapper.OrderActiveDetailMapper.selectByPrimaryKey" select="com.xxfc.platform.order.mapper.OrderActivityDetailMapperr.selectByPrimaryKey"
javaType="com.xxfc.platform.order.entity.OrderActiveDetail"></association> javaType="com.xxfc.platform.order.entity.OrderActivityDetail"></association>
</case> </case>
</discriminator> </discriminator>
</resultMap> </resultMap>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment