合并代码

puzhibing

2024-03-06 fba3b84ee4e8b60f1536c50d032e4f199ec172a2

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

@@ -31,4 +31,5 @@
    private Integer heat;
    @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
    private Integer status;
    private Long pId;
}