Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 8019eb016f806c1166223b1e2f08c1f9d7a96117

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

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

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

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