From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index e7328c7..396d7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 /dist
 .idea/
 server/.idea/
-*.xml
 *.class
 target/
 # Mobile Tools for Java (J2ME)
@@ -15,6 +14,9 @@
 *.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