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

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -11,7 +11,11 @@
    /**
     * 参赛数据id
     */
    private Long id;
    private Long participantId;
    /**
     * 参赛人员类型
     */
    private Integer participantType;
    /**
     * 姓名
     */