| @@ -636,7 +636,8 @@ | |||||
| <result column="amount" jdbcType="INTEGER" property="amount" /> | <result column="amount" jdbcType="INTEGER" property="amount" /> | ||||
| <result column="remaining_amount" jdbcType="INTEGER" property="remainingAmount" /> | <result column="remaining_amount" jdbcType="INTEGER" property="remainingAmount" /> | ||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | |||||
| <collection column="{productId=coupon_id}" property="merchantVoList" | <collection column="{productId=coupon_id}" property="merchantVoList" | ||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | ofType="com.iformall.domain.vo.WxMerchantVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| @@ -652,7 +653,7 @@ | |||||
| <sql id="allCUserCardListColumns"> | <sql id="allCUserCardListColumns"> | ||||
| co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date, | co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date, | ||||
| c.cover_img,c.title,c.sub_title,c.detail,c.unit,c.remark, | c.cover_img,c.title,c.sub_title,c.detail,c.unit,c.remark, | ||||
| a.amount,a.remaining_amount | |||||
| a.amount,a.remaining_amount,c.support_transfer | |||||
| </sql> | </sql> | ||||
| <sql id="allCUserCardDetailColumns"> | <sql id="allCUserCardDetailColumns"> | ||||