From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
index 740115b..6658add 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
@@ -42,6 +42,11 @@
@TableField("amount")
private Double amount;
/**
+ * 未分配金额
+ */
+ @TableField("unallocatedAmount")
+ private Double unallocatedAmount;
+ /**
* 支付方式（1=微信，2=系统充值）
*/
@TableField("payType")
@@ -71,4 +76,9 @@
*/
@TableField("agentId")
private Integer agentId;
+ /**
+ * 剩余待分账金额
+ */
+ @TableField("surplusDividedAmount")
+ private Double surplusDividedAmount;
}
--
Gitblit v1.7.1