From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +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 |    5 ++++-
 1 files changed, 4 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 183c22e..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")
@@ -64,6 +65,8 @@
     HashMap<String, Object> actYys(@RequestBody CompetionVO vo);
 
 
+    @PostMapping("/base/competition/queryAppUserId")
+    List<Integer> queryAppUserId(List<Integer> storeIds);
 }
 
 

--
Gitblit v1.7.1