Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 ad1f4f786436a8a7d9d9b4e0f2df243c1768581d

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

@@ -231,6 +231,7 @@
   PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);

    SettlementTotalVO settlementTotal(String time);
    SettlementTotalVO settlementTotalR(String time,Long userId);

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