Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java

@@ -21,6 +21,7 @@

    /**
     * 获取我的赛事报名记录
     *
     * @param uid
     * @param type
     * @param pageSize
@@ -33,6 +34,7 @@

    /**
     * 获取我报名的赛事详情
     *
     * @param id
     * @return
     * @throws Exception
@@ -42,6 +44,7 @@

    /**
     * 取消赛事报名
     *
     * @param id
     * @return
     * @throws Exception