From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 19 八月 2025 08:58:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java index 761309c..d58b844 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java @@ -11,8 +11,9 @@ @Data @ApiModel public class WorldCupListVo { - @ApiModelProperty("世界杯id") private String id; + @ApiModelProperty("世界杯id") + private Integer worldCupId; @ApiModelProperty("名称") private String name; @ApiModelProperty("报名截止时间") @@ -27,6 +28,8 @@ private String content; @ApiModelProperty("热度") private Integer heat; + @ApiModelProperty("比赛状态(1=未开始,2=已开始,3=已结束,4=已取消)") + private Integer status; private Double distance; private String lon; private String lat; -- Gitblit v1.7.1