From 1859ea0a7a1eead549f39d4216a9a0d9ec757fb2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 13 四月 2021 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 0192362..8dcf81a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -133,6 +133,15 @@
     R pageDynamic(@RequestBody ComActDynVO comActDynVO);
 
     /**
+     * 管理后台分页查询社区动态
+     *
+     * @param comActDynVO 查询参数
+     * @return 动态集合
+     */
+    @PostMapping("pagedynamicByAdmin")
+    R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
+
+    /**
      * 社区动态详情
      *
      * @param id 动态id
@@ -1690,7 +1699,7 @@
      * @param questId 问卷ID
      */
     @PostMapping("/questnaire/answerslist")
-    R answerResultList(Long questId);
+    R answerResultList(@RequestParam("questId") Long questId);
 
 
     /**
@@ -1725,7 +1734,7 @@
      * @param pageQuestnaireSubDetailsDTO 问卷ID
      */
     @PostMapping("/questnaire/qaqeustanswerdetails")
-    R qaQeustAnswerDetails(PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+    R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
 
 
     /**
@@ -1734,6 +1743,6 @@
      * @return 分页数据
      */
     @PostMapping("/questnaire/pagequestnaireanswer")
-    R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+    R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
 
 }

--
Gitblit v1.7.1