Merge remote-tracking branch 'origin/master'

xuhy

2024-09-04 8c16911f9f6b339f1373b89822455561f40ff80c

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

@@ -887,8 +887,6 @@
      return this.baseMapper.getYearData(chargingOrderIds);
   }
   @Resource
   private IPartnerService partnerService;
   @Resource
   private SysUserClient sysUserClient;
   @Resource
   private UserSiteClient userSiteClient;
@@ -1067,6 +1065,12 @@
   }

   @Override
   public R payRefund(PayOrderRefundDto payOrderQueryDto) {
      return null;
   }


   @Override
   public ChargingOrderListInfoVO chargingInfo(String uid) {
      TChargingOrder chargingOrder= this.getById(uid);