From d8208e23a088e6f7898fba609d70ee6d41b308da Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 23 八月 2024 10:12:41 +0800
Subject: [PATCH] Merge branch 'master-jiayan' into master-jiayan-test

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

diff --git a/.gitignore b/.gitignore
index c836fce..141c53f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /target/
+/.idea
\ No newline at end of file

--
Gitblit v1.8.0