Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-12 1a5edd0695b2cfbe4f0728268c4ebc5292c44b66

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1690,7 +1690,7 @@
     * @param questId 问卷ID
     */
    @PostMapping("/questnaire/answerslist")
    R answerResultList(Long questId);
    R answerResultList(@RequestParam("questId") Long questId);


    /**
@@ -1725,7 +1725,7 @@
     * @param pageQuestnaireSubDetailsDTO 问卷ID
     */
    @PostMapping("/questnaire/qaqeustanswerdetails")
    R qaQeustAnswerDetails(PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
    R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);


    /**
@@ -1734,6 +1734,6 @@
     * @return 分页数据
     */
    @PostMapping("/questnaire/pagequestnaireanswer")
    R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
    R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);

}