From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
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