Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 26d4aacdf40f7283dc3dae2043a35162b2665864

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -65,7 +65,7 @@

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

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

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