From f95325fd2635a9af08c0acac70e70379978d128a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 七月 2023 19:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 8452551..6ffed56 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
@@ -14,7 +14,7 @@
 @ApiModel
 public class CompetitionInfo {
     @ApiModelProperty("赛事id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty("赛事图片")
     private String imgs;
     @ApiModelProperty("赛事名称")
@@ -23,12 +23,16 @@
     private Integer registerCondition;
     @ApiModelProperty("门店名称")
     private String storeName;
+    @ApiModelProperty("门店照片")
+    private String storeCoverDrawing;
     @ApiModelProperty("门店地址")
     private String storeAddress;
     @ApiModelProperty("门店经度")
     private String storeLon;
     @ApiModelProperty("门店纬度")
     private String storeLat;
+    @ApiModelProperty("距离")
+    private Double distance;
     @ApiModelProperty("报名结束时间")
     private String registerEndTime;
     @ApiModelProperty("开始时间")

--
Gitblit v1.7.1