Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java

@@ -145,11 +145,32 @@
    /**
     * 一起议-详情 小程序
     * @param id 主键
     * @param userId 用户主键
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussapplets")
    public R detailDiscussApplets(@RequestParam("id") Long id){
        return comActDiscussService.detailDiscussApplets(id);
    public R detailDiscussApplets(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
        return comActDiscussService.detailDiscussApplets(id,userId);
    }

    /**
     * 一起议-投票
     * @param comActDiscussOptionUserDTO 投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO){
        return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
    }

    /**
     * 一起议-评论-点赞、取消点赞
     * @param comActDiscussUserDTO 评论点赞
     * @return 点赞结果
     */
    @PostMapping("putdiscusscommentuser")
    public R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO){
        return comActDiscussService.putDiscussCommentUser(comActDiscussUserDTO);
    }

}