Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -5,9 +5,6 @@ import { history } from 'umi';
 import ProCard from '@ant-design/pro-card'
 
 
-const goBack = () => {
-  history.goBack()
-}
 const FormItem = Form.Item
 export default (props) => {
 
@@ -26,8 +23,7 @@ export default (props) => {
 
   return (
     <Card >
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
-      >
+      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
         <ProCard.TabPane key={1} tab="基本参数">
           <Form {...formItemLayout} onFinish={Submit} form={form} >
             <FormItem label="平台联系电话" name="shopName" rules={[{ required: true, message: '请输入' }]}>

src/pages/user/Login/index.jsx

@@ -50,7 +50,7 @@ const Login = () => {
               <span className={styles.title}>南阳智慧农机系统</span>
             </Link>
           </div>
-          <div className={styles.desc}>我们是一群被打了鸡血的小伙伴</div>
+          {/* <div className={styles.desc}>我们是一群被打了鸡血的小伙伴</div> */}
         </div>
 
         <div className={styles.main}>