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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java

@@ -15,7 +15,7 @@
@ApiModel
public class MyWorldCupInfo {
    @ApiModelProperty("世界杯id")
    private Integer id;
    private Long id;
    @ApiModelProperty("图片")
    private String infoImg;
    @ApiModelProperty("名称")