From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
index 237c23d..eca7bd0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
@@ -4,10 +4,11 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
-public class PointDetailsVo {
+public class PointDetailsVo {
@ApiModelProperty(value = "记录id")
private Integer detailsId;
@@ -42,4 +43,21 @@
@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;
+
+ @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
}
--
Gitblit v1.7.1