Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

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

@@ -106,7 +106,7 @@

   Map<String, Object> countLocalCar();

    Long getAver(@Param("siteIds") List<Integer> siteIds);
   Double getAver(@Param("siteIds") List<Integer> siteIds);

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

@@ -137,4 +137,6 @@
   List<Map<String, Object>> countAllUserData();

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

   Long countNoTag();
}