Merge branch 'xgh_内容中台' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -151,6 +151,8 @@ public class ContentMaterialController {
                     return contentMaterialInfoVO;
                 }).collect(Collectors.toList());
         result.setResult(contentMaterialInfos);
+        result.setCurrentPage(contentMaterialQO.getPageNum());
+        result.setPageSize(contentMaterialQO.getPageSize());
         return RestResponse.successResult(result);
     }