Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -12,7 +12,7 @@
@ApiModel
public class CompetitionListVo {
    @ApiModelProperty("赛事id")
    private Integer id;
    private Long id;
    @ApiModelProperty("赛事名称")
    private String name;
    @ApiModelProperty("赛事封面")