From cf71d9d89d60b01ef733150785fbbbaa01fb42f6 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 09 四月 2021 17:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 5567c69..1fdd0c0 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
@@ -1638,22 +1638,22 @@
R getPopulationLists(@RequestBody List<Long> Ids);
/**
- * 新增社区问卷
+ * 创建调查问卷
*
* @param questnaireVO
* @return
*/
@PostMapping("/questnaire/addquestnaire")
- R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
/**
- * 新增社区问卷
+ * 社区问卷列表
*
- * @param questnaireVO
+ * @param pageQuestnaireDTO
* @return
*/
@PostMapping("/questnaire/pagequestnaire")
- R pageQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
/**
@@ -1663,7 +1663,7 @@
* @return
*/
@PostMapping("/questnaire/editquestnaire")
- R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ;
/**
@@ -1682,5 +1682,5 @@
* @return
*/
@PostMapping("/questnaire/deletequestnaire")
- R editQuestnaireDO(@RequestParam("questId") Long questId);
+ R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
}
--
Gitblit v1.7.1