From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
index ee07f46..b10b08c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.feignclient.model.BillingRequest;
 import com.dsh.competition.model.CompetitionInfo;
 import com.dsh.competition.model.CompetitionListVo;
 import com.dsh.competition.util.ResultUtil;
@@ -43,4 +44,9 @@
      * @throws Exception
      */
     ResultUtil cancelMyCompetition(Long id) throws Exception;
+
+    List<BillingRequest> queryDatas(Integer appUserId, String monthStart, String monthEnd);
+
+    List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd);
+
 }

--
Gitblit v1.7.1