From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java |   88 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 86 insertions(+), 2 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..7a6d0cd 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
@@ -3,7 +3,12 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 import lombok.Data;
 
@@ -40,6 +45,16 @@
     private String activityAddr;
 
     /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
      * 活动状态
      */
     private Integer status;
@@ -50,7 +65,7 @@
     private Date publishAt;
 
     /**
-     * 互动结束时间
+     * 活动结束时间
      */
     private Date endAt;
 
@@ -68,6 +83,12 @@
      * 报名结束时间
      */
     private Date signUpEnd;
+
+    /**
+     * 参加人群
+     */
+    private String aattendPeople;
+
 
     /**
      * 志愿者人数下线
@@ -100,6 +121,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 +170,42 @@
      * 社区id
      */
     private Long communityId;
+    /**
+     * 活动是否已默认好评
+     */
+    private Integer isDefaultPraise;
+    /**
+     * 签到范围，默认0无限制
+     */
+    @TableField("`range`")
+    private Integer range;
+    /**
+     * 是否有积分奖励（1.是 2.否）
+     */
+    private Integer haveIntegralReward;
+    /**
+     * 积分奖励方式（1.按次奖励 2.记时奖励）
+     */
+    private Integer rewardWay;
+    /**
+     * 奖励积分
+     */
+    private Integer rewardIntegral;
+    /**
+     * 参与次数上限
+     */
+    @TableField("`limit`")
+    private Integer limit;
+    /**
+     * 是否允许取消（1.允许 2.不允许）
+     */
+    private Integer canCancel;
+    /**
+     * 取消扣除积分
+     */
+    private Integer cancelDeduct;
+    /**
+     * 活动类型
+     */
+    private String activityType;
 }

--
Gitblit v1.7.1