From d5d9f1e5c7d61f12c904c99ff81bbc1ba665337d Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Mon, 22 Nov 2021 14:43:46 +0800
Subject: [PATCH] Merge branch 'feature' into develop

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

diff --git a/.gitignore b/.gitignore
index 32858aa..5c3f700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/.idea/

--
Gitblit v1.9.1