From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +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, 10 insertions(+), 4 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 4bf4f7b..bbc3cc6 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
@@ -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("报名须知")
@@ -61,4 +63,8 @@
private List<ParticipantVo> participant;
@ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
private Integer status;
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
+ @ApiModelProperty("支付方式（1=微信，2=支付宝，3=玩湃币，4=课时）")
+ private Integer payType;
}
--
Gitblit v1.7.1