feat:解决合并代码后的冲突

src/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-04-27 20:35:34
  * @Date: 2020-04-27 20:35:34
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-04 09:55:15
+ * @LastEditTime: 2021-07-04 16:59:14
  * @Description:
  * @Description:
  */
  */
 
 
@@ -17,8 +17,8 @@ import { RootRouter } from './routes/index';
 import 'antd/dist/antd.less';
 import 'antd/dist/antd.less';
 import 'video-react/dist/video-react.css';
 import 'video-react/dist/video-react.css';
 import '@/common/less/index.less';
 import '@/common/less/index.less';
+import '@/core/downloads';
 import '@/core/function';
 import '@/core/function';
-// import '@/core/downloads';
 import '@/core/xmTD';
 import '@/core/xmTD';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
 import Service from "@/common/js/service";
 import Service from "@/common/js/service";