Merge branch 'dev' of http://git.ycjcjy.com/ubpa/pc-admin into dev

src/pages/org/org/Edit/components/AdminPage.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { Form, Input, Button, message } from 'antd';
+import { history } from 'umi';
 import md5 from 'md5';
 import { saveOrgUser, getOrgAdminDetail } from '@/services/org';
 
@@ -40,7 +41,6 @@ export default (props) => {
         form={adminForm}
         labelCol={{ span: 8 }}
         wrapperCol={{ span: 16 }}
-        initialValues={adminFormData}
         onFinish={onAdminFinish}
       >
         <Form.Item

src/pages/org/org/Edit/components/BasicPage.jsx

@@ -1,9 +1,9 @@
 import { Form, Input, Button } from 'antd';
-import QRCode from './QRCode'
+import { history } from 'umi';
 import React, { useEffect, useState, useCallback, useRef, useMemo } from 'react'
 import { useModel } from 'umi'
 import { getDetail, saveOrg, updateOrg } from '@/services/org';
-
+import QRCode from './QRCode'
 
 export default (props) => {
   const { id } = props;
@@ -51,7 +51,6 @@ export default (props) => {
         form={form}
         labelCol={{ span: 8 }}
         wrapperCol={{ span: 16 }}
-        initialValues={formData}
         onFinish={onFinish}
         onFinishFailed={onFinishFailed}
         autoComplete="off"