From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 51a63b6..752424e 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,8 +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.ListQuery;
+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;
@@ -17,6 +16,20 @@
 
     @PostMapping("/base/competition/list")
     Page<Competition> list(ListQuery listQuery);
+
+    @PostMapping("/base/competition/add")
+    void add(Competition competition);
+
+    @PostMapping("/base/competition/update")
+    void update(Competition competition);
+
+    @PostMapping("/base/competition/cancel")
+    void cancel(Integer id);
+    @PostMapping("/base/competition/getPeopleFromId")
+    Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);
+
+    @PostMapping("/base/competition/listUser")
+    Page<CompetitionUser> listUser(CompetitionUserQuery competitionUserQuery);
 }
 
 

--
Gitblit v1.7.1