From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-open-api/src/main/resources/application-dev.yml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index ba2ddcb..e3f40c7 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -16,6 +16,8 @@
     username: root
     url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     password: 34821015
+#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#    password: xltys1995
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5
@@ -56,11 +58,11 @@
   #RCS閾炬帴
   rcs:
     #閾炬帴
-    host: http://192.168.4.84
+    host: http://127.0.0.1
     #绔彛
     port: 8088
   wms:
     #閾炬帴
-    host: http://127.0.0.1
+    host: http://127.0.0.1銆�
     #绔彛
-    port: 8080
\ No newline at end of file
+    port: 8085
\ No newline at end of file

--
Gitblit v1.9.1