From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 十二月 2023 09:16:29 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java index 24e25a1..b1390ef 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java @@ -5,6 +5,7 @@ import lombok.Data; import java.math.BigDecimal; +import java.util.List; @Data public class ExchangeDetailsResponse { @@ -30,10 +31,21 @@ @ApiModelProperty(value = "有效期结束时间") private String endTime; - @ApiModelProperty(value = "使用状态 (1已使用 2未使用)") + @ApiModelProperty(value = "使用状态 (1已使用 2未使用 3 已过期)") private Integer useStatus; @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券") private Integer goodType; + + private Integer userId; + + + private List<Integer> rid; + + private List<Integer> sid; + + @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡") + private Integer cardType; + } -- Gitblit v1.7.1