From 535296ad8d0482856e98f788c667f3fa72576637 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 10 Mar 2021 17:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/.gitignore b/.gitignore
index f112f7f..9a8a286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,11 @@
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.
+/.idea/
+/screen-api/target/
+/screen-common/target/
+/screen-manage/target/
+/.idea/
+myBatisPlusGenerator/src/test/
+screen-common/src/main/resources/
+screen-manage/src/test/

--
Gitblit v1.8.0