From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 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 2c484a5..63c01a5 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
@@ -209,4 +209,38 @@
      * 活动类型
      */
     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;
 }

--
Gitblit v1.7.1