Merge remote-tracking branch 'origin/master'

liujie

2023-08-08 5592de9cf80aa78486775a72a6224973c93146da

 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);

}