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-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java |    1 +
 1 files changed, 1 insertions(+), 0 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 c919df1..21a352e 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
@@ -31,4 +31,5 @@
     private Integer heat;
     @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
     private Integer status;
+    private Long pId;
 }

--
Gitblit v1.7.1