From 26043931d294d84ff7ef0305bf7879f74d70afdd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 五月 2026 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0.1
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 8a516c7..25092cd 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -76,6 +76,10 @@
private BigDecimal thirdPayAmount;
@ApiModelProperty(value = "余额支付金额")
private BigDecimal balancePayAmount;
+ @ApiModelProperty(value = "余额收入")
+ private BigDecimal balanceIncome;
+ @ApiModelProperty(value = "余额赠送收入")
+ private BigDecimal balanceGiftIncome;
@ApiModelProperty(value = "充电后剩余金额")
private BigDecimal residualAmount;
@ApiModelProperty(value = "累计电费")
--
Gitblit v1.7.1