Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/competition/ParticipantClient.java

@@ -18,6 +18,6 @@
     * @return
     */
    @PostMapping("/participant/getParticipant")
    Participant getParticipant(Integer id);
    Participant getParticipant(Long id);

}