From d0bbb8e6bfc57ad7d2dc6e240d80062412d19b64 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 25 九月 2024 19:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/.gitignore b/.gitignore
index 5dedbdc..a5e2876 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,12 @@
 lx_file/upload/
 lucene/
-attachment/upload/
+attachment/upload/*/
+!attachment/upload/template/
 target/
 .classpath
 .project
-.settings/
\ No newline at end of file
+.settings/
+logs/
+resources/
+pom.xml
+pom.xml_no

--
Gitblit v1.9.2