Merge remote-tracking branch 'origin/master'

xuhy

2024-10-23 8bce927ce49c6cf9c7dd625e96571e83262d9e71

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

@@ -197,6 +197,7 @@
   List<Map<String, Object>> usersDay1();

   List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
   List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto);


   List<Map<String, Object>> getUserTagCount();