From 2d0487d82ff61219c71155699b52d8d339a2443a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 23 三月 2022 14:35:27 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 612591b..b553ba3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -191,7 +191,7 @@
             sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT  开始,请按时参加", beginAt, beginAt));
             sysUserNoticeVO.setBusinessId(activityId);
             sysUserNoticeVO.setStatus(0);
-            sysUserNoticeVO.setActivityType(isVolunteer.intValue() == 1 ? 1 : 2);
+            sysUserNoticeVO.setActivityType(comActActivityVO.getType());
             sysUserNoticeVO.setBusinessStatus(2);
             R r1 = userService.addNotice(sysUserNoticeVO);
             if (R.isOk(r1)) {

--
Gitblit v1.7.1