From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 2e5ae9b..b487ec3 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
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Map;
/**
* @author zhibing.pu
@@ -14,7 +15,7 @@
@ApiModel
public class MyWorldCupInfo {
@ApiModelProperty("世界杯id")
- private Integer id;
+ private Long id;
@ApiModelProperty("图片")
private String infoImg;
@ApiModelProperty("名称")
@@ -31,12 +32,18 @@
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 List<ParticipantVo> participants;
+ @ApiModelProperty("支付方式（0=免费，1=微信，2=支付宝，3=玩湃币，4=课时）")
+ private Integer payType;
@ApiModelProperty("比赛费用单价")
private Double unitPrice;
@ApiModelProperty("支付费用")
@@ -49,4 +56,6 @@
private Integer status;
@ApiModelProperty("是否可取消（0=否，1=是）")
private Integer revocable;
+ @ApiModelProperty("门店信息")
+ private List<Map<String, Object>> storeInfos;
}
--
Gitblit v1.7.1