From 6db1505ab4ec5488855660a6aea4580f7e850dfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 14:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
index ba76c18..3154e54 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
@@ -101,6 +101,12 @@
@ApiModelProperty(value = "承担金额")
@TableField("proportion_money")
private BigDecimal proportionMoney;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String proportionPartnerString;
+ @ApiModelProperty(value = "平台充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String proportionMoneyString;
@ApiModelProperty(value = "本期结算电费总金额 （实际电费转账）")
@TableField("total_electronic")
private BigDecimal totalElectronic;
--
Gitblit v1.7.1