Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-23 59c5450e074572a607908986f8dc2e6dbd1151d5

 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();