From f917fc4d42481ea072bef864ace63d9572b89bb5 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 25 八月 2021 16:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
index 54cec63..b39bdee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -5,6 +5,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -40,6 +41,16 @@
     private String activityAddr;
 
     /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
      * 活动状态
      */
     private Integer status;
@@ -70,6 +81,12 @@
     private Date signUpEnd;
 
     /**
+     * 参加人群
+     */
+    private String aattendPeople;
+
+
+    /**
      * 志愿者人数下线
      */
     private Integer volunteerMin;
@@ -100,6 +117,31 @@
     private Integer hasPrize;
 
     /**
+     * 是否二维码签到 1 是 0否
+     */
+    private Integer isQrCode;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    private String contactPhone;
+
+    /**
+     * 是否签到 1 是 0否
+     */
+    private Integer isRegist;
+
+    /**
+     * 是否顶部 1 是 0否
+     */
+    private Integer isTop;
+
+    /**
      * 奖品备注
      */
     private String prizeRemark;

--
Gitblit v1.7.1