From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +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 |    3 +++
 1 files changed, 3 insertions(+), 0 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..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
@@ -13,6 +13,7 @@
 public class WorldCupListVo {
     @ApiModelProperty("世界杯id")
     private String 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