From f360321afa268f8d4e6c19e9a45eaf9f70c770b2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 17:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .gitignore |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f89836e..396d7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,10 @@
 coderd.json
 node_modules
 /dist
-
+.idea/
+server/.idea/
 *.class
-
+target/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -12,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