From d48f05ab04d7bc92fabeff894297df184e0a506b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index e4071ff4..41864aea 100644 --- a/src/js/dai/request.js +++ b/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";