From fe2d7c404c69700404814e18a70d5e606916486b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 24 七月 2025 15:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 .gitignore |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28c91ac..6bb8c15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,7 @@
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/ruoyi-admin/src/main/resources/application.yml
-/ruoyi-admin/src/main/resources/application-druid.yml
-/ruoyi-admin/src/main/resources/logback.xml
-/ruoyi-generator/src/main/resources/generator.yml
+#/ruoyi-admin/src/main/resources/application.yml
+#/ruoyi-admin/src/main/resources/application-druid.yml
+#/ruoyi-admin/src/main/resources/logback.xml
+#/ruoyi-generator/src/main/resources/generator.yml

--
Gitblit v1.9.3