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

无关风月

昨天 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -11,8 +11,8 @@
@Data
@ApiModel
public class WorldCupListVo {
    @ApiModelProperty("世界杯id")
    private String id;
    @ApiModelProperty("世界杯id")
    private Integer worldCupId;
    @ApiModelProperty("名称")
    private String name;