From 697582a7e65e6110a22dad7bc8241d25fe3ecc51 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 二月 2025 10:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index 61f43bf..d82ae1a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -175,13 +175,7 @@
 	 * 停止充电返回账单后计算费用
 	 * @param vo
 	 */
-	void endChargeBillingCharge(TransactionRecordMessageVO vo);
-	
-//	/**
-//	 * 停止充电返回账单后计算费用
-//	 * @param vo
-//	 */
-//	void endChargeBillingCharge1(TransactionRecordMessageVO vo);
+	R endChargeBillingCharge(TransactionRecordMessageVO vo);
 	
 	
 

--
Gitblit v1.7.1