From 7d2330819e11cc505d3721373af34263f5c2fc16 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 二月 2025 17:54:30 +0800
Subject: [PATCH] Merge branch 'dev_zj' into dev

---
 .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