From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 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..b67cd4b 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;
@@ -68,6 +79,12 @@
      * 报名结束时间
      */
     private Date signUpEnd;
+
+    /**
+     * 参加人群
+     */
+    private String aattendPeople;
+
 
     /**
      * 志愿者人数下线
@@ -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;
@@ -124,4 +166,8 @@
      * 社区id
      */
     private Long communityId;
+    /**
+     * 活动是否已默认好评
+     */
+    private Integer isDefaultPraise;
 }

--
Gitblit v1.7.1