From 26d4aacdf40f7283dc3dae2043a35162b2665864 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 10:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 5ed82b6..da641ce 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1370,8 +1370,8 @@
 	}
 
 	@Override
-	public Map<String, Object> countAll(LocalDate sixBefore) {
-		return this.baseMapper.countAll(sixBefore);
+	public Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds) {
+		return this.baseMapper.countAll(sixBefore,siteIds);
 	}
 
 	@Override

--
Gitblit v1.7.1