From 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 19 八月 2021 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
index 5dbb704..2b676af 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -26,6 +26,9 @@
             " caq.project_key, " +
             " caq.title, " +
             " caq.state, " +
+            " caq.for_masses, " +
+            " caq.for_party, " +
+            " caq.for_volunteer, " +
             " caq.join_count, " +
             " caq.remark, " +
             " caq.is_cover, " +
@@ -96,6 +99,9 @@
             " title, " +
             " remark, " +
             " is_cover, " +
+            " for_masses, " +
+            " for_party, " +
+            " for_volunteer, " +
             " is_force, " +
             " adver_position_popup, " +
             " adver_position_top, " +
@@ -115,6 +121,9 @@
             " id, " +
             " title, " +
             " remark, " +
+            " for_masses, " +
+            " for_party, " +
+            " for_volunteer, " +
             " is_cover, " +
             " is_force, " +
             " adver_position_popup, " +
@@ -150,4 +159,6 @@
     List<QuestnaireStatisticsSummaryExcelAdminVO> getStatisticsSummaryExcelAdmin(@Param("questId") Long questId);
 
     QuestnaireStatisticsSummaryHeaderAdminVO statisticsSummaryHeader(@Param("questId") Long questId);
+
+    void addNoNotice(@Param("questId") Long questId,@Param("userId") Long userId);
 }

--
Gitblit v1.7.1