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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 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("名称")