Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-12 134d13688e4b6677133ba2d362d2978d8bda2b87

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

@@ -14,7 +14,7 @@
@ApiModel
public class CompetitionInfo {
    @ApiModelProperty("赛事id")
    private Integer id;
    private Long id;
    @ApiModelProperty("赛事图片")
    private String imgs;
    @ApiModelProperty("赛事名称")
@@ -59,4 +59,6 @@
    private Integer apply;
    @ApiModelProperty("报名参赛人员")
    private List<ParticipantVo> participant;
    @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
    private Integer status;
}