From 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 28 七月 2023 15:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 baec733..fe122d8 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
@@ -4,17 +4,25 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class ExchangeDetailsResponse {
@ApiModelProperty(value = "记录id")
- private Integer detailsId;
+ private Long detailsId;
@ApiModelProperty(value = "商品名称")
private String goodName;
- @ApiModelProperty(value = "支付类型（积分 / 积分+现金）")
- private String requiredType;
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
+ private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
private String startTime;
--
Gitblit v1.7.1