From 5e6c3ac5d7c7a2702a0bad5195e954c9e95d2306 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期日, 15 六月 2025 17:55:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index eeda31e..5b27cd5 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -321,10 +321,3 @@
       - D:\\hy_test\\b
       - D:\\hy_test\\c
     interval: 10000  # 鐩戞帶闂撮殧(ms)
-ferry:
-  file:
-    path: /data/ferry
-    max-file-size: 10MB
-
-security:
-  encryption-key: 1234567890abcdef

--
Gitblit v1.9.3