From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 driver/guns-admin/src/main/resources/application.yml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index f409d2c..b49df62 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -110,9 +110,9 @@
 
 #支付回调地址
 #正式环境
-#callbackPath: https://okyueche.com:443/user
+callbackPath: https://chaoshengdaijia.com:443/driver
 #测试环境
-callbackPath: http://121.37.15.157:80/driver
+#callbackPath: http://121.37.15.157:80/driver
 
 
 ---

--
Gitblit v1.7.1