From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/.gitignore b/.gitignore
index 5fc2201..da635d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.class
-
+.idea/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -29,7 +29,6 @@
 pnpm-debug.log*
 
 # Editor directories and files
-.idea
 .vscode
 *.suo
 *.ntvs*

--
Gitblit v1.9.3