From 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 28 七月 2023 15:16:23 +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, 4 insertions(+), 0 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 28c3d75..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
@@ -63,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