From 1b9b482e6c55f043a586665b84d2d0feb8daa397 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 15 九月 2021 14:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 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..e6e80bd 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,11 @@
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+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 +44,16 @@
private String activityAddr;
/**
+ * 纬度
+ */
+ private String lat;
+
+ /**
+ * 经度
+ */
+ private String lng;
+
+ /**
* 活动状态
*/
private Integer status;
@@ -50,7 +64,7 @@
private Date publishAt;
/**
- * 互动结束时间
+ * 活动结束时间
*/
private Date endAt;
@@ -68,6 +82,12 @@
* 报名结束时间
*/
private Date signUpEnd;
+
+ /**
+ * 参加人群
+ */
+ private String aattendPeople;
+
/**
* 志愿者人数下线
@@ -100,6 +120,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 +169,8 @@
* 社区id
*/
private Long communityId;
+ /**
+ * 活动是否已默认好评
+ */
+ private Integer isDefaultPraise;
}
--
Gitblit v1.7.1