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

无关风月

昨天 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -1,12 +1,14 @@
package com.dsh.communityWorldCup.model;

import com.alibaba.fastjson.serializer.ToStringSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class WorldCupUserListVo {
    @ApiModelProperty("报名id")
    private Long id;
    private String id;

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