From f53c26884de8f3fd5b15a5a36c5743225d8b5628 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 06 十二月 2024 16:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |    1 +
 1 files changed, 1 insertions(+), 0 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 eae2704..c8e78d3 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
@@ -231,6 +231,7 @@
 	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
 
     SettlementTotalVO settlementTotal(String time);
+    SettlementTotalVO settlementTotalR(String time,Long userId);
 
 	List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
 

--
Gitblit v1.7.1