Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/logistics/list/addCompany.tsx

@@ -65,24 +65,24 @@ const columns: ColumnType<any>[] = [
   }
 ]
 // 模拟请求
-const fetchData = (params: any) => {
-  return new Promise((resolve, reject) => {
-    const queryResult = data.find(v => v.key === params.keywords)
-    setTimeout(() => {
-      resolve({
-        code: 200,
-        message: '',
-        data: queryResult ? [queryResult] : data
-      })
-    }, 1000)
-  })
-}
-
-// const fetchData = async (params) =>{
-//   const res = await PublicApi.getMemberManageLowerPageBynamerole(params)
-//   return res.data 
+// const fetchData = (params: any) => {
+//   return new Promise((resolve, reject) => {
+//     const queryResult = data.find(v => v.key === params.keywords)
+//     setTimeout(() => {
+//       resolve({
+//         code: 200,
+//         message: '',
+//         data: queryResult ? [queryResult] : data
+//       })
+//     }, 1000)
+//   })
 // }
 
+const fetchData = async (params) =>{
+  const res = await PublicApi.getMemberManageLowerPageBynamerole(params)
+  return res.data 
+} 
+
 
 const { Option } = Select;
 const defaultValue = 'lucy'
@@ -240,6 +240,7 @@ const company: React.FC<{}> = () => {
               (<Form
                 form={menuForm}
                 colon={false}
+                
                 name="edit_infomation"
                 layout="horizontal"
                 labelAlign="left"