From 53d586646ab1222f0cb7f0313000d1829c889eba Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期六, 20 五月 2023 12:00:13 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0

---
 .gitignore |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2276a29..a5e2876 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 lx_file/upload/
 lucene/
-attachment/upload/
+attachment/upload/*/
+!attachment/upload/template/
 target/
 .classpath
 .project
 .settings/
 logs/
+resources/
+pom.xml
+pom.xml_no

--
Gitblit v1.9.2