From 4b9e8610e48d5a4fd4e0ceb55c79b3f36146bc2b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 17:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 3 +--
1 files changed, 1 insertions(+), 2 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 742c6f2..475d8a4 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
@@ -145,7 +145,7 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, Object> countAll(LocalDateTime sixBefore, List<Integer> siteIds);
+ Map<String, Object> countAll(List<Integer> siteIds);
List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
@@ -197,7 +197,6 @@
Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
- List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
List<Map<String, Object>> usersDay1();
--
Gitblit v1.7.1