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-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
index 07a3ac6..5e19b08 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -92,6 +92,12 @@
private String replaceUser;
@Excel(name = "车架号",width = 30)
private String carSiteName;
+ @Excel(name = "余额收入",width = 30)
+ private String balanceIncome;
+ @Excel(name = "余额赠送收入",width = 30)
+ private String balanceGiftIncome;
+ @Excel(name = "引流平台分佣",width = 30)
+ private String tripartiteCommission;
@Excel(name = "车架号来源",width = 30)
private String carSiteSource;
@Excel(name = "车牌号",width = 30)
--
Gitblit v1.7.1