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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java

@@ -44,7 +44,7 @@
     * 参赛人id
     */
    @TableField("participantId")
    private Integer participantId;
    private Long participantId;
    /**
     * 参赛方（1=蓝方，2=红方）
     */