From 2bb7fa462be64127c2c22c30556aee4f0707a6cb Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Tue, 01 Mar 2022 13:59:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/.gitignore b/.gitignore
index ef67264..ef6b348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,7 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/
-gitflow-installer.sh
\ No newline at end of file
+gitflow-installer.sh
+target/
+**/target/
+*.iml
\ No newline at end of file

--
Gitblit v1.9.1