From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java
index 6540f3b..6138ffd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java
@@ -1,6 +1,7 @@
 package com.panzhihua.service_community.service;
 
 import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
 import com.panzhihua.common.model.vos.R;
 
 /**
@@ -85,13 +86,27 @@
     /**
      * 一起议-详情 小程序
      * @param id 主键
+     * @param userId 用户主键
      * @return ComActDiscussVO
      */
-    R detailDiscussApplets(Long id);
+    R detailDiscussApplets(Long id, Long userId);
     /**
      * 一起议-投票
      * @param comActDiscussOptionUserDTO 投票信息
      * @return 投票结果
      */
     R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
+    /**
+     * 一起议-评论-点赞、取消点赞
+     * @param comActDiscussUserDTO 评论点赞
+     * @return 点赞结果
+     */
+    R putDiscussCommentUser(ComActDiscussCommentUserDTO comActDiscussUserDTO);
+
+    /**
+     * 工作大屏-一起议列表
+     * @param discussListDTO    请求参数
+     * @return  一起议列表
+     */
+    R getScreenDiscussList(ScreenDiscussListDTO discussListDTO);
 }

--
Gitblit v1.7.1