From 4275b293cfc7779a20ccea30b2f773aff0fe06db Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 13:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 .gitignore |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9788e55..6503723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,5 +46,6 @@
 !*/build/*.html
 !*/build/*.xml
 
+
 *.yml
-*.xml
+ruoyi-admin/src/main/resources/*.xml

--
Gitblit v1.9.3