From ccd1837ee6016e0b72557f98ea45fc2e4f152ae1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 三月 2025 11:10:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 5d8d476..2147175 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
@@ -70,7 +70,7 @@
     @ApiModelProperty(value = "平台手续费")
     private BigDecimal rechargeAmount;
     @ApiModelProperty(value = "引流平台")
-    private String sourceName;
+    private String tripartitePlatformName;
     @ApiModelProperty(value = "平台分佣")
     private BigDecimal sharingAmount;
     @ApiModelProperty(value = "开始时间")

--
Gitblit v1.7.1