From 77e1a3c262f53ed3234151058b8ec8196998ada0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 527f3c2..687f9cd 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
@@ -227,6 +227,10 @@
     @ApiModelProperty(value = "可用积分")
     @TableField("available_point")
     private Integer availablePoint;
+    
+    @ApiModelProperty(value = "可用总积分数")
+    @TableField("total_available_point")
+    private Integer totalAvailablePoint;
 
     @ApiModelProperty(value = "可转增积分")
     @TableField("transferable_point")
@@ -307,7 +311,7 @@
     @TableField(exist = false)
     private Set<Integer> shopIds;
 
-    @ApiModelProperty(value = "降级预警")
+    @ApiModelProperty(value = "降级预警(0=否,1=是)")
     @TableField("is_danger")
     private Integer isDanger;
 

--
Gitblit v1.7.1