From 794186d529b9f185032e6c3eb97d78f0c75555a6 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 14 一月 2026 16:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan

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

diff --git a/.gitignore b/.gitignore
index ca7f20f..396d7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,9 @@
 node_modules
 /dist
 .idea/
-*.xml
+server/.idea/
 *.class
-
+target/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -13,6 +13,10 @@
 *.jar
 *.war
 *.ear
-
+*.iml
+/logs
+*.log
+*.zip
+h5/unpackage/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

--
Gitblit v1.9.3