From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
index 4824418..4bf4f7b 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
@@ -14,7 +14,7 @@
@ApiModel
public class CompetitionInfo {
@ApiModelProperty("赛事id")
- private Integer id;
+ private Long id;
@ApiModelProperty("赛事图片")
private String imgs;
@ApiModelProperty("赛事名称")
@@ -59,4 +59,6 @@
private Integer apply;
@ApiModelProperty("报名参赛人员")
private List<ParticipantVo> participant;
+ @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
+ private Integer status;
}
--
Gitblit v1.7.1