From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java
index 85cd333..6d59f3d 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+import java.util.Map;
+
/**
* @author zhibing.pu
* @Date 2024/2/28 16:49
@@ -29,18 +32,30 @@
private String age;
@ApiModelProperty("报名性别(0=全部，1=男，2=女)")
private Integer gender;
+ @ApiModelProperty("省")
+ private String province;
+ @ApiModelProperty("市")
+ private String city;
@ApiModelProperty("参赛地址")
private String address;
@ApiModelProperty("参与赛点")
private String stores;
- @ApiModelProperty("比赛费用(现金)")
- private Double cash;
- @ApiModelProperty("比赛费用(玩湃币)")
- private Double paiCoin;
- @ApiModelProperty("比赛费用(课时)")
- private Double classHour;
+ @ApiModelProperty("参赛人员列表")
+ private List<ParticipantVo> participants;
+ @ApiModelProperty("支付方式（0=免费，1=微信，2=支付宝，3=玩湃币，4=课时）")
+ private Integer payType;
+ @ApiModelProperty("比赛费用单价")
+ private Double unitPrice;
+ @ApiModelProperty("支付费用")
+ private Double expense;
@ApiModelProperty("简介")
private String intro;
@ApiModelProperty("富文本")
private String content;
+ @ApiModelProperty("比赛状态（1=未开始，2=已开始，3=已结束，4=已取消）")
+ private Integer status;
+ @ApiModelProperty("是否可取消（0=否，1=是）")
+ private Integer revocable;
+ @ApiModelProperty("门店信息")
+ private List<Map<String, Object>> storeInfos;
}
--
Gitblit v1.7.1