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

101captain

2022-03-03 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java

@@ -249,4 +249,11 @@
     * @return
     */
    R editDiscussResult(ComActDiscussDTO comActDiscussDTO);

    /**
     * 一起议获取是否有发布权
     * @param comActDiscussDTO
     * @return
     */
    R getDiscussPermissions(ComActDiscussDTO comActDiscussDTO);
}