Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 26d4aacdf40f7283dc3dae2043a35162b2665864

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

@@ -140,7 +140,7 @@

   List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);

   Map<String, Object> countAll(LocalDate sixBefore);
   Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);

    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);