Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 26d4aacdf40f7283dc3dae2043a35162b2665864

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1370,8 +1370,8 @@
   }

   @Override
   public Map<String, Object> countAll(LocalDate sixBefore) {
      return this.baseMapper.countAll(sixBefore);
   public Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds) {
      return this.baseMapper.countAll(sixBefore,siteIds);
   }

   @Override