From 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 六月 2022 17:57:53 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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 7a6d0cd..07f369f 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
@@ -186,6 +186,7 @@
/**
* 积分奖励方式（1.按次奖励 2.记时奖励）
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer rewardWay;
/**
* 奖励积分
@@ -208,4 +209,46 @@
* 活动类型
*/
private String activityType;
+
+ /**
+ * 是否居民活动
+ */
+ private Integer isProject;
+
+ /**
+ * 项目id
+ */
+ private Long projectId;
+
+ /**
+ * 1志愿者活动 2居民活动 3党员活动 4项目活动
+ */
+ private Integer type;
+
+ /**
+ * 党员参与者人数下线
+ */
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ private Integer partyMemberMax;
+ /**
+ * 签退范围，默认0无限制
+ */
+ private Integer signOutRange;
+
+ /**
+ * 单次活动时长（小时）
+ */
+ private Integer duration;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
+
+ private Long relationId;
+
+ private String phone;
}
--
Gitblit v1.7.1