From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 三月 2024 10:11:21 +0800 Subject: [PATCH] 合并代码 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java | 3 ++- 1 files changed, 2 insertions(+), 1 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 0e4ab59..0851d56 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 @@ -11,6 +11,7 @@ import java.util.HashMap; import java.util.List; +import java.util.Map; @FeignClient("mb-cloud-competition") public interface CompetitionClient { @@ -46,7 +47,7 @@ @PostMapping("/base/competition/getPeopleFromId1") - List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery); + Page<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery); @PostMapping("/base/competition/getPeoples") List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery); @PostMapping("/base/competition/listUser") -- Gitblit v1.7.1