From e631f307d90aadf6e20d40d0d30a5f29d4b0767f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 18 三月 2024 16:04:11 +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/PointDetailsVo.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 d644a90..27f6e7f 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
@@ -11,7 +11,7 @@
 public class PointDetailsVo {
 
     @ApiModelProperty(value = "记录id")
-    private Integer detailsId;
+    private Long detailsId;
 
     @ApiModelProperty(value = "图片集")
     private List<String> pics;
@@ -19,7 +19,7 @@
     @ApiModelProperty(value = "商品名称")
     private String goodName;
 
-    @ApiModelProperty(value = "适用状态(1已使用 2未使用)")
+    @ApiModelProperty(value = "适用状态(1已使用 2未使用 3已过期)")
     private Integer useType;
 
     @ApiModelProperty(value = "有效期开始时间")
@@ -58,4 +58,9 @@
     @ApiModelProperty(value = "兑换方式(1=积分,2=积分+现金)")
     private Integer exchangeType;
 
+    @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+    private Integer cardType;
+
+    @ApiModelProperty(value = "使用范围")
+    private Integer exchangeAddrType;
 }

--
Gitblit v1.7.1