From 428e4087c9595cc693e2eea5b325b69ae798cecd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 15 Jun 2020 07:05:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E7=A0=81html][=E4=BF=AE=E6=94=B9]:B?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponOrderController.java | 1 + .../src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index d142934a8..894cfc71d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -179,6 +179,7 @@ public class WxCouponOrderController extends BaseController { wxCouponOrderCVo.setValidStartDate(wxCouponCVo.getValidStartDate()); wxCouponOrderCVo.setValidEndDate(wxCouponCVo.getValidEndDate()); wxCouponOrderCVo.setAutoRefund(wxCouponCVo.getAutoRefund()); + wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType()); return new ResultData(wxCouponOrderCVo); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index b1a99a75c..0b9dd2b51 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -70,6 +70,8 @@ public class WxCouponOrderCVo extends WxCouponOrder { private Date validStartDate; @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; + @io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType") + private Integer contentType; /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="name")