From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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 a940cd8..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
@@ -31,16 +31,14 @@
     @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 Integer userId;
 
 
     private List<Integer> rid;

--
Gitblit v1.7.1