Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/material/cloudNew/material.tsx

@@ -516,6 +516,7 @@ const Material = forwardRef(({ onAddFolder, onUpdateFolder, onDelFolder }: Props
                     ref.current?.scrollTo({ top: 0 })
                     setTimeout(() => setMaterialParams({ ...materialParams, pageNum: page, pageSize }), 50)
                 }}
+                showTotal={(total: number) => <span style={{ fontSize: 12 }}>共{total}条</span>}
             />
         </div>}
 

src/pages/launchSystemV3/material/tencent/index.tsx

@@ -304,6 +304,7 @@ const Tencent: React.FC = () => {
                                 ref.current?.scrollTo({ top: 0 })
                                 setTimeout(() => setQueryParams({ ...queryParams, pageNum: page, pageSize }), 50)
                             }}
+                            showTotal={(total: number) => <span style={{ fontSize: 12 }}>共 {total} 条</span>}
                         />
                     </div>
                 </div>