Merge branch 'xgg-admin-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin-dev

xgg-admin/app/base/system.js

@@ -185,8 +185,8 @@ class System {
 				order: "http://127.0.0.1:3103" + path,
 				order: "http://127.0.0.1:3103" + path,
 
 
 				// 发票服务
 				// 发票服务
-				// invoice: domain + ":3105" + path,
-				invoice: "http://127.0.0.1:3105" + path,
+				invoice: domain + ":3105" + path,
+				// invoice: "http://127.0.0.1:3105" + path,
 
 
 				// 发票服务
 				// 发票服务
 				uc: domain + ":3106" + path,
 				uc: domain + ":3106" + path,

xgg-admin/app/front/entry/public/apidoc/order/order.md

@@ -475,7 +475,7 @@
         "rows": [
         "rows": [
             {
             {
                 "id": "13699868075000706",
                 "id": "13699868075000706",
-                "merchant_id": null,
+                "merchant_id": null,          
                 "businessmen_id": null,
                 "businessmen_id": null,
                 "orderpay_id": null,
                 "orderpay_id": null,
                 "price": 50000,
                 "price": 50000,