From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java | 6 +++++- 1 files changed, 5 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 36a5b79..2c13147 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 @@ -12,7 +12,8 @@ @ApiModel public class WorldCupListVo { @ApiModelProperty("世界杯id") - private Integer id; + private String id; + private Integer worldCupId; @ApiModelProperty("名称") private String name; @ApiModelProperty("报名截止时间") @@ -27,6 +28,9 @@ 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