Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/common/centerorderSve.js

@@ -306,7 +306,8 @@ class CenterorderService extends AppServiceBase {
         orderNo: pobj.actionBody.channelOrder.channelOrderNo,
         orderPrice: Number(pobj.actionBody.orderPrice / 100),
         phone: pobj.actionBody.publishMobile,
-        needId: solutiondata.data.channelNeedNo
+        needId: solutiondata.data.channelNeedNo,
+        companyName:solutiondata.data.solutionContent.solution.CompanyName || ''
       },
       appInfo: pobj.appInfo
     }

center-channel/app/base/service/impl/trademark/toolSve.js

@@ -84,7 +84,7 @@ class ToolService extends AppServiceBase {
   }
 
   async getOssConfig(pobj, req) {//获取oss信息
-    var reqUrl = settings.centerAppUrl() + "auth/accessAuth/getOssInfo";
+    var reqUrl = settings.reqZcApi() + "api/tool/toolApi/getOssConfig";
     var result = await this.restPostUrl(pobj, reqUrl);
     return result;
   }