From 0275498af38bc1c8fbc5bfea54f3cce3550fd6ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 11 二月 2025 09:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile 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