From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 a2ac377..4f3406e 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,7 +31,7 @@
@ApiModelProperty(value = "有效期结束时间")
private String endTime;
- @ApiModelProperty(value = "使用状态 （1已使用 2未使用）")
+ @ApiModelProperty(value = "使用状态 （1已使用 2未使用 3 已过期）")
private Integer useStatus;
@ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
@@ -39,6 +40,14 @@
private Integer userId;
- private Integer sid;
+
+
+
+ private List<Integer> rid;
+
+ private List<Integer> sid;
+
+ @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
}
--
Gitblit v1.7.1