From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java |    8 ++++++++
 1 files changed, 8 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 bbc3cc6..f3b338c 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
@@ -5,6 +5,7 @@
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhibing.pu
@@ -67,4 +68,11 @@
     private Double payMoney;
     @ApiModelProperty("支付方式(1=微信,2=支付宝,3=玩湃币,4=课时)")
     private Integer payType;
+    @ApiModelProperty("是否需要实名(0=否,1=是)")
+    private Integer isReal;
+    @ApiModelProperty("门店信息")
+    private List<Map<String, Object>> storeInfos;
+
+    @ApiModelProperty("是否已过报名时间0否,1是")
+    private Integer hasPass;
 }

--
Gitblit v1.7.1