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