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

mitao

2025-04-11 f4894c44735012e51b7f3ade126b5bf9d7757202

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