Merge branch 'feature-content4-3' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/comment/CommentCountQO.java

@@ -30,6 +30,11 @@ public class CommentCountQO extends BasePageInfo {
     private String clerkId;
 
     /**
+     * 评论ID （查询子评论使用）取parentContentMaterialCommentId字段，如果有就传，没有就取contentMaterialCommentId
+     */
+    private String contentMaterialCommentId;
+
+    /**
      * 滚动查询，评论ID
      */
     private Long nextContentMaterialCommentId;