From 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 28 七月 2023 15:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java
index 3e6c6e5..c919df1 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java
+++ b/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("赛事封面")
@@ -29,4 +29,6 @@
     private String age;
     @ApiModelProperty("热度")
     private Integer heat;
+    @ApiModelProperty("状态(1=未开始,2=进行中,3=已结束,4=已取消)")
+    private Integer status;
 }

--
Gitblit v1.7.1