From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index a11d964..adf4d13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -629,12 +629,6 @@
                         .collect(Collectors.toList());
                 comActActivityVO.setSignCount(collect.size());
                 ActivitySignVO activitySignVO = collect.get(0);
-                Integer isVolunteer = activitySignVO.getIsVolunteer();
-                if (isVolunteer.intValue() == 1) {
-                    comActActivityVO.setType(1);
-                } else {
-                    comActActivityVO.setType(2);
-                }
                 Integer activityStatus = comActActivityVO.getStatus();
                 if (activityStatus.intValue() == 3) {
                     comActActivityVO.setStatus(4);

--
Gitblit v1.7.1