记得上下班打卡 | git大法好,push需谨慎

Commit 070425b7 authored by 姜秀龙's avatar 姜秀龙

Merge branch 'dev_skip_shumei' into 'master'

跳过数美

See merge request !386
parents 0e3206a1 6cb62d3b
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
'theme': 'explorer-fas', 'theme': 'explorer-fas',
// 'uploadUrl': "/kylin/banners/upload3", // 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload", // 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload", 'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload/unsm",
"uploadExtraData": { "uploadExtraData": {
"pathName" : "banner", "pathName" : "banner",
"buckType" : 1 "buckType" : 1
......
...@@ -694,7 +694,7 @@ ...@@ -694,7 +694,7 @@
// 'uploadUrl': "/kylin/banners/upload3", // 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': ctx + "system/user/profile/updateAvatar", // 'uploadUrl': ctx + "system/user/profile/updateAvatar",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload", // 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload", 'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload/unsm",
"uploadExtraData": { "uploadExtraData": {
"pathName": "banner", "pathName": "banner",
"buckType": 1 "buckType": 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment