合并冲突

src/js/dai/request.js

@@ -2,12 +2,8 @@
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
 import axios from "axios";
-<<<<<<< HEAD
-// import message from "dai-js/modules/message/message";
-=======
 import message from "dai-js/modules/message/message";
 import { Message } from "element-ui";
->>>>>>> dev-20220218
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";