From 218c85f5128b95cedcc20127c60d1915bb1f7bc6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 三月 2025 16:33:12 +0800
Subject: [PATCH] Merge branch 'dev_zj' into dev

---
 ruoyi-admin/src/main/resources/application.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index acdb6fb..8a825d3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
   # 鐗堟潈骞翠唤
   copyrightYear: 2025
   # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  profile: D:/ruoyi/uploadPath
+  profile: /javaWork/lims-ruoyi/file/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
   # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -78,8 +78,8 @@
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
-    # 瀵嗙爜
-#    password: 123456
+#    # 瀵嗙爜
+#    password: root2022!
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     lettuce:

--
Gitblit v1.9.3