From 0ab23878ac6b8d7f0613be9cd9999e311bddaa46 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 17 May 2019 16:55:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=9A=E5=B0=81=E9=9D=A2=E5=9B=BE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:C=E7=AB=AF=E5=A4=9A=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E5=9B=BE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxCouponCVo.java | 6 ------ .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 3de61a95b..2e628bc13 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -47,23 +47,17 @@ public class WxCouponCVo extends WxCoupon implements Serializable { } - /*券ID**/ @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; - /*投放频道位置(1.列表, 2.限时抢购)**/ @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.列表, 2.限时抢购)",name="targetAd") private Integer targetAd; /*发放相关参数*/ - /*开始时间**/ @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") private Date beginTime; - /*结束时间**/ @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") private Date endTime; - - /*发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 88d6356ba..768f11b8e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -194,7 +194,7 @@ cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, - c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price, + c.tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price, c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date, c.valid_days,c.detail,c.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.press_limit_num, c.auto_refund,c.credit_price @@ -211,6 +211,7 @@ +