From d0e60de5e2cba3d1665de375df1622fdec789b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 11 Jan 2020 16:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/common/educoder.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index de76be239..102e9e49e 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -7,6 +7,7 @@ export { export { default as setmiyah } from './Component'; export { default as queryString } from './UrlTool2'; +<<<<<<< HEAD export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl , getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth @@ -14,6 +15,13 @@ export { } from './UrlTool'; export { setmiyah as setmiyah } from './Component'; export { default as queryString } from './UrlTool2'; +======= +export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl + , getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth + , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from './UrlTool'; +export {setmiyah as setmiyah} from './Component'; +export { default as queryString } from './UrlTool2'; +>>>>>>> ea48e12... 合并 阿里云 export { trigger as trigger, on as on, off as off