From e93a1ffbe1b01253d7a9808cc7a05b5c69413c8d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 11:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..28c3d75 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("赛事名称")
@@ -47,10 +47,12 @@
private String city;
@ApiModelProperty("参赛地址")
private String address;
- @ApiModelProperty("支付方式（1=现金，2=玩湃币支付，3=课时支付）")
- private Integer payType;
- @ApiModelProperty("支付价格")
- private Double price;
+ @ApiModelProperty("现金支付价格")
+ private Double cashPrice;
+ @ApiModelProperty("玩湃币支付价格")
+ private Integer playPaiCoin;
+ @ApiModelProperty("课时支付价格")
+ private Integer classPrice;
@ApiModelProperty("赛事简介")
private String introduction;
@ApiModelProperty("报名须知")
@@ -59,4 +61,6 @@
private Integer apply;
@ApiModelProperty("报名参赛人员")
private List<ParticipantVo> participant;
+ @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
+ private Integer status;
}
--
Gitblit v1.7.1