From e0623f1a914ecbc99d5926c0df3cf26032c02499 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:11:50 +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 |    5 ++++-
 1 files changed, 4 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 9f06d29..527f3c2 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
@@ -77,7 +77,6 @@
 
     @ApiModelProperty(value = "删除(0=否,1=是)")
     @TableField("del_flag")
-    @TableLogic
     private Boolean delFlag;
 
     @ApiModelProperty(value = "0否1是第一次添加")
@@ -228,6 +227,10 @@
     @ApiModelProperty(value = "可用积分")
     @TableField("available_point")
     private Integer availablePoint;
+
+    @ApiModelProperty(value = "可转增积分")
+    @TableField("transferable_point")
+    private Integer transferablePoint;
     
     @ApiModelProperty(value = "是否可更换推广人(0=否,1=是)")
     @TableField("change_promoter")

--
Gitblit v1.7.1