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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

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

@@ -12,7 +12,7 @@
@ApiModel
public class EntrantRank {
    @ApiModelProperty(value = "参赛人id", required = true, dataType = "int")
    private Integer id;
    private Long id;
    @ApiModelProperty(value = "是否是学员", required = true, dataType = "int")
    private Integer isStudent;
    private Integer appUserId;