Merge branch 'hotfix_商家端店铺图片上传' into test

Conflicts:
	code/index.js
	dist/yohobuy-shops-fe/4.8.3/jquery/shop.modular.Decorator.js
	dist/yohobuy-shops-fe/4.8.3/jquery/shop.modular.Index.js
	server/controllers/shop.modularDecorator.js
	server/index.js

@@ -2,7 +2,7 @@ module.exports=function(app) {
 	app.get("/ajax/link/:name","common_downExcel");
 	app.get("/ajax/down","common_exportExcel");
 	
-	app.post("/ajax/upload","common_multipart");
+	app.post("/shops-proxy/ajax/upload","common_multipart");
 	app.post("/ajax/ueditor","common_baiduUeditor");
 	app.post("/ajax/proxy","common_proxy");
 

@@ -443,7 +443,7 @@ edit.prototype = {
 };
 edit.ajaxfileupload = function(el, option) {
     $(el).ajaxfileupload({
-        'action': '/ajax/upload',
+        'action': '/shops-proxy/ajax/upload',
         'params': $.extend({}, {
             __type: "fileupload-upload"
         }, option.params),