From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
index ab90979..5279264 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
@@ -145,11 +145,12 @@
     /**
      * 一起议-详情 小程序
      * @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);
     }
 
     /**
@@ -162,4 +163,14 @@
         return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
     }
 
+    /**
+     * 一起议-评论-点赞、取消点赞
+     * @param comActDiscussUserDTO 评论点赞
+     * @return 点赞结果
+     */
+    @PostMapping("putdiscusscommentuser")
+    public R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO){
+        return comActDiscussService.putDiscussCommentUser(comActDiscussUserDTO);
+    }
+
 }

--
Gitblit v1.7.1