From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
index 287ed69..2594c9b 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
@@ -57,7 +57,7 @@
* @return
* @throws Exception
*/
- ResultUtil delParticipant(Integer id) throws Exception;
+ ResultUtil delParticipant(Integer id, Integer isStudent) throws Exception;
/**
@@ -69,7 +69,7 @@
void saveParticipant(SaveParticipant saveParticipant) throws Exception;
Page<CompetitionUser> getPeopleFromId(Page<UserCompetition> participantPage, Integer id, Integer state);
- List<CompetitionUser> getPeopleFromId1(Page<UserCompetition> participantPage, Integer id, Integer state);
+ Page<CompetitionUser> getPeopleFromId1(long offset, long limit, Integer id, Integer state);
List<CompetitionUser> getPeoples(Integer id, Integer state);
}
--
Gitblit v1.7.1