Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP-XiaoXing into caolc

更新
Merge pull request 'caolc' (#12 ) from caolc into master
2023-07-05 19:05:09 +08:00 · 2023-06-20 14:27:10 +08:00 · 2023-06-06 07:58:21 +00:00 · 2023-06-06 06:57:19 +00:00
1 changed files with 1 additions and 1 deletions
--- a/BagStation/pages/makeOrder/orderPaying.vue
+++ b/BagStation/pages/makeOrder/orderPaying.vue
@@ -316,7 +316,7 @@
 					orderId: this.order.orderSerialNumber,
 					payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
 					userIp:  (this.userIp?this.userIp:"36.57.160.59"),
-					merchantNo:10089145264
+					merchantNo:'10089145264'
 				}
 				oilPayApi.aggregatePay(payData).then(res => {
Author	SHA1	Message	Date
caolc	b375bb826d	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP-XiaoXing into caolc	2023-07-05 19:05:09 +08:00
xiaozhiyong	8e8e9926d5	更新	2023-06-20 14:27:10 +08:00
曹连存	e8b6cc2914	Merge pull request 'caolc' (#12 ) from caolc into master Reviewed-on: #12	2023-06-06 07:58:21 +00:00
肖志勇	3ebd48fb67	Merge pull request 'xiaozy' (#11 ) from xiaozy into master Reviewed-on: #11	2023-06-06 06:57:19 +00:00