From 0ca3a3922d2d25df52682b2290be15135cce100e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 29 九月 2026 17:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java
index d0798e3..e4eaacb 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java
@@ -63,6 +63,10 @@
@TableField("balance")
private java.math.BigDecimal balance;
+ @ApiModelProperty(value = "锁定额度（元）：充电申请时锁定，结算时解锁并按实际消费扣减")
+ @TableField("locked_amount")
+ private java.math.BigDecimal lockedAmount;
+
@ApiModelProperty(value = "所属公司名称（列表远程回填，不落库）")
@TableField(exist = false)
private String companyName;
--
Gitblit v1.7.1