From 65ece4e9e659ba7d0be699a64a4ca016d37a637b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 15 一月 2025 14:43:14 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- 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