Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-01 a85ab71180fdcb02b3cae304ebc96bb2ca12423c

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

@@ -110,7 +110,7 @@

   List<Map<String, Object>> getLevelEvaluate(@Param("siteIds")List<Integer> siteIds);

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

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