From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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 0943afa..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
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -41,6 +41,16 @@
private String activityAddr;
/**
+ * 纬度
+ */
+ private String lat;
+
+ /**
+ * 经度
+ */
+ private String lng;
+
+ /**
* 活动状态
*/
private Integer status;
@@ -71,6 +81,12 @@
private Date signUpEnd;
/**
+ * 参加人群
+ */
+ private String aattendPeople;
+
+
+ /**
* 志愿者人数下线
*/
private Integer volunteerMin;
@@ -96,9 +112,34 @@
private String cover;
/**
- * 是否有奖品 1 有 0 无
+ * 是否有奖品 1 有 0 无
*/
private Integer hasPrize;
+
+ /**
+ * 是否二维码签到 1 是 0否
+ */
+ private Integer isQrCode;
+
+ /**
+ * 联系人姓名
+ */
+ private String contactName;
+
+ /**
+ * 联系人电话
+ */
+ private String contactPhone;
+
+ /**
+ * 是否签到 1 是 0否
+ */
+ private Integer isRegist;
+
+ /**
+ * 是否顶部 1 是 0否
+ */
+ private Integer isTop;
/**
* 奖品备注
@@ -125,4 +166,8 @@
* 社区id
*/
private Long communityId;
+ /**
+ * 活动是否已默认好评
+ */
+ private Integer isDefaultPraise;
}
--
Gitblit v1.7.1