Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java

@@ -43,6 +43,10 @@
    void cancel(Integer id);
    @PostMapping("/base/competition/getPeopleFromId")
    Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);


    @PostMapping("/base/competition/getPeopleFromId1")
    List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery);
    @PostMapping("/base/competition/getPeoples")
    List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery);
    @PostMapping("/base/competition/listUser")
@@ -60,6 +64,8 @@
    HashMap<String, Object> actYys(@RequestBody CompetionVO vo);


    @PostMapping("/base/competition/queryAppUserId")
    List<Integer> queryAppUserId(List<Integer> storeIds);
}