From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..854d597 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,25 @@
@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;
+
+ private Integer cardType;
+
+ @ApiModelProperty(value = "使用范围")
+ private Integer exchangeAddrType;
+
}
--
Gitblit v1.7.1