合并代码

puzhibing

2023-12-14 f21cf2729f0ebf3cfea564c8bc0fc7349cdabe48

 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;
}