Merge branch 'xgg-deliver-ali' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-deliver-ali

xgg-deliver/app/base/controller/impl/invoice/invoiceCtl.js

@@ -116,7 +116,7 @@ class InvoiceCtl extends CtlBase {
       pobj.additional_tax = system.y2f(pobj.additional_tax);
       pobj.value_added_tax = system.y2f(pobj.value_added_tax);
       pobj.personal_invoice_tax = system.y2f(pobj.personal_invoice_tax);
-      pobj.invoice_content = system.y2f(pobj.invoice_content);
+      // pobj.invoice_content = system.y2f(pobj.invoice_content);
       return await this.invoiceSve.invoiceApply(pobj);
     } catch (error) {
       console.log(error);

xgg-deliver/app/base/system.js

@@ -193,11 +193,11 @@ class System {
 				// merchant: "http://127.0.0.1:3101" + path,
 
 				// 订单服务
-				// order: domain2 + ":3103" + path,
+				// order: domain + ":3103" + path,
 				order: domain2  + ":3103"+ path,
 
 				// 发票服务
-				invoice: domain + ":3105" + path,
+				invoice: domain2 + ":3105" + path,
 
 				// 发票服务
 				uc: domain2 + ":3106" + path,