From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 03 一月 2024 11:43:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java | 3 ++- 1 files changed, 2 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 81623bc..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 @@ -12,7 +12,7 @@ @ApiModel public class CompetitionListVo { @ApiModelProperty("赛事id") - private Integer id; + private Long id; @ApiModelProperty("赛事名称") private String name; @ApiModelProperty("赛事封面") @@ -31,4 +31,5 @@ private Integer heat; @ApiModelProperty("状态(1=未开始,2=进行中,3=已结束,4=已取消)") private Integer status; + private Long pId; } -- Gitblit v1.7.1