From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
index 365ef77..c12dce0 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
@@ -1,10 +1,7 @@
package com.dsh.course.feignClient.competition;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.competition.model.Competition;
-import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
-import com.dsh.course.feignClient.competition.model.ListQuery;
-import com.dsh.course.feignClient.competition.model.Participant;
+import com.dsh.course.feignClient.competition.model.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -29,8 +26,13 @@
@PostMapping("/base/competition/cancel")
void cancel(Integer id);
@PostMapping("/base/competition/getPeopleFromId")
- Page<Participant> getPeopleFromId(GetPeopleQuery getPeopleQuery);
+ Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);
+ @PostMapping("/base/competition/listUser")
+ Page<CompetitionUser> listUser(CompetitionUserQuery competitionUserQuery);
+
+ @PostMapping("/base/competition/listAudit")
+ Page<Competition> listAudit(ListQuery listQuery);
}
--
Gitblit v1.7.1