From b50e57bf7e17d696ddb4e9785c909052da034ef4 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 14 七月 2026 09:10:47 +0800
Subject: [PATCH] Merge branch '2.1' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.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/ChargingBillVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
index 2f68bfb..6ef06fc 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
@@ -30,6 +30,10 @@
private BigDecimal commissionAmount;
@ApiModelProperty(value = "三方平台分佣")
private BigDecimal sharingAmount;
+ @ApiModelProperty(value = "平台收入")
+ private BigDecimal platformIncome;
+ @ApiModelProperty(value = "合作商收入")
+ private BigDecimal partnerIncome;
@ApiModelProperty(value = "优惠抵扣")
private BigDecimal discount;
@ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")
--
Gitblit v1.7.1