Merge branch 'test'

CeDo

2021-05-11 757e5dc619ddf01fbd9ec2c8c75b6663d79835cb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -106,7 +106,7 @@
            " from com_act_neighbor_circle_comment_reply as reply" +
            " left join sys_user as su on su.user_id = reply.user_id" +
            " left join sys_user as su1 on su1.user_id = reply.parent_user_id" +
            " where reply.comment_id = #{commentId}")
            " where reply.comment_id = #{commentId} and reply.status = 1")
    IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);

}