From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
index 5ca79be..612fe90 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
@@ -86,4 +86,8 @@
      * 业务主键 用于跳转
      */
     private Long businessId;
+    /**
+     * 社区活动类型 1志愿者活动 2居民活动
+     */
+    private Integer activityType;
 }

--
Gitblit v1.7.1