From 3f8e43bb394301b7018a03d2d38e70e1232443d6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 16:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
index 01f5b32..b3bbe06 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
@@ -11,6 +11,9 @@
@ApiModelProperty(value = "总积分")
private Integer totalPoint;
+ @ApiModelProperty(value = "可消费积分")
+ private Integer consumePoint;
+
@ApiModelProperty(value = "消费积分数")
private Integer shopPoint;
@@ -25,4 +28,7 @@
@ApiModelProperty(value = "门店返佣积分")
private Integer shopSharePoint;
+
+ @ApiModelProperty(value = "是否可转赠积分")
+ private Integer giftPoint;
}
--
Gitblit v1.7.1