Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-14 d20dbd5d97b3f418533d5d23fd337cdec9f95939

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