From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
index 4f49cfb..948641a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -22,7 +22,7 @@
@ApiModelProperty(value = "现金")
private BigDecimal cash;
- @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=会员赠送)")
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时切goodType=3门票时 展示的二维码内容增加一个vipDetail:当前数据id)")
private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
@@ -43,9 +43,7 @@
private List<Integer> rid;
private List<Integer> sid;
- @ApiModelProperty(value = "当exchangeType=3会员赠送时存储1 门票二维码格式内容新增该字段 用于标明该门票为会员赠送" +
- "，使用时存储门票记录")
- private Integer isVipCode;
+
@ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
private Integer cardType;
--
Gitblit v1.7.1