Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-08 52d18b0c747f12c64c9f9b36acb1b5e25f131e0c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -180,6 +180,7 @@
   List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);

   List<Map<String, Object>> usersDay();
   List<Map<String, Object>> usersDay1();

   List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);

@@ -240,4 +241,6 @@
   List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> countAllUserData();

   List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
}