From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 27 七月 2023 17:45:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java index 8bf0fac..9949082 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -42,4 +43,20 @@ @ApiModelProperty(value = "兑换说明") private String contents; + + @ApiModelProperty(value = "课包课时数") + private Integer classHours; + + @ApiModelProperty(value = "积分") + private Integer integral; + + @ApiModelProperty(value = "现金") + private BigDecimal cash; + + @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券") + private Integer goodType; + + @ApiModelProperty(value = "兑换方式(1=积分,2=积分+现金)") + private Integer exchangeType; + } -- Gitblit v1.7.1