Merge remote-tracking branch 'origin/master'

xuhy

2024-11-01 3d24cd1458df38d6556c33f9b513b8f4df976626

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

@@ -232,7 +232,7 @@

    SettlementTotalVO settlementTotal(String time);

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

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