|
|
|
@@ -111,7 +111,7 @@ |
|
|
|
c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, |
|
|
|
c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, |
|
|
|
c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, |
|
|
|
c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support |
|
|
|
c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support,c.gift_list |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="statusColumns"> |
|
|
|
@@ -644,6 +644,8 @@ |
|
|
|
<result column="content_type" jdbcType="INTEGER" property="contentType"/> |
|
|
|
<result column="source_type" jdbcType="INTEGER" property="sourceType"/> |
|
|
|
|
|
|
|
<result column="gift_list" jdbcType="VARCHAR" property="giftList"></result> |
|
|
|
|
|
|
|
<collection column="{productId=id,tenantId=tenant_id}" property="merchantVoList" |
|
|
|
ofType="com.iformall.domain.vo.WxMerchantVo" |
|
|
|
javaType="java.util.List" |
|
|
|
|