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

无关风月

昨天 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java

@@ -6,7 +6,7 @@
@Data
public class WorldCupUserListVo {
    @ApiModelProperty("报名id")
    private Long id;
    private String id;

    @ApiModelProperty("姓名")
    private String name;