From aa241a47c90ed776062adf0b8daccf288a21836f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:55:54 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 5be8070..4fbce81 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,11 +42,6 @@
@TableField("amount")
private Double amount;
/**
- * 未分配金额
- */
- @TableField("unallocatedAmount")
- private Double unallocatedAmount;
- /**
* 支付方式（1=微信，2=系统充值）
*/
@TableField("payType")
@@ -76,4 +71,9 @@
*/
@TableField("agentId")
private Integer agentId;
+ /**
+ * 剩余待分账金额
+ */
+ @TableField("surplusDividedAmount")
+ private Double surplusDividedAmount;
}
--
Gitblit v1.7.1