From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 5198cbf..303c4a2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -181,7 +181,9 @@
private String qrCode;
-
+ @ApiModelProperty("消费绿电分数")
+ @TableField(exist = false)
+ private Integer customPoint;
@ApiModelProperty("绑定门店id列表")
@TableField(exist = false)
@@ -197,20 +199,14 @@
@TableField(exist = false)
private Set<Long> userIds;
- @TableField(exist = false)
- private Integer excludeStatus;
+
public String getIdStr(){
return String.valueOf(id);
}
- public Integer getUserTotalPoint(){
- totalPoint = rechargePoint+cancelPoint+exchangePoint+transferableInPoint+transferableOutPoint;
-
- return totalPoint ;
- }
--
Gitblit v1.7.1