From e1a6e20d22fbcb862247fac0a671a2a2722e7755 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 14:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

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

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

--
Gitblit v1.9.3