Merge branch 'master' into kitchenmanage

src/pages/device/productmanage/index.jsx

@@ -532,7 +532,7 @@ const handleRemove = async (ids) => {
       id="table1"
       actionRef={actiontopisRef}
       rowKey="id"
-      pagination={{ defaultPageSize: 10,total:total }}
+      pagination={{ defaultPageSize: 10 }}
       search={{labelWidth: 120}}
       columns={topicscolumns}
       toolBarRender={() => [
@@ -549,7 +549,7 @@ const handleRemove = async (ids) => {
      
       ]}
       //数据绑定
-      dataSource={dataSource}
+      // dataSource={dataSource}
       request={async (params) => {
         var data = [];
         var total = 0;
@@ -581,11 +581,11 @@ const handleRemove = async (ids) => {
       actionRef={actiontopismrRef}
       rowKey="id"
       search={false}
-      pagination={{ defaultPageSize: 10,total:total }}
+      pagination={{ defaultPageSize: 10}}
       columns={topicsmrcolumns}
       toolBarRender={false}
       //数据绑定
-      dataSource={dataSource}
+      // dataSource={dataSource}
       request={async (params) => {
         var data = [];
         var total = 0;