Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java

@@ -12,7 +12,7 @@
@ApiModel
public class CompetitionListVo {
    @ApiModelProperty("赛事id")
    private Integer id;
    private Long id;
    @ApiModelProperty("赛事名称")
    private String name;
    @ApiModelProperty("赛事封面")
@@ -31,4 +31,5 @@
    private Integer heat;
    @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
    private Integer status;
    private Long pId;
}