Merge branch 'dev' into test

src/api/index.js

@@ -1,7 +1,7 @@
 import api from './request';
 import { Modal } from 'antd';
 const axios=require('axios');
-axios.defaults.baseURL = 'http://192.168.2.237:8871';//'http://192.168.2.237:8871/';
+// axios.defaults.baseURL = 'http://192.168.2.237:8871';//'http://192.168.2.237:8871/';
 const CancelToken = axios.CancelToken;
 const source = CancelToken.source();
 const post=(url,data)=>{