From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

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

diff --git a/.gitignore b/.gitignore
index 9a8a286..fae67da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,8 @@
 myBatisPlusGenerator/src/test/
 screen-common/src/main/resources/
 screen-manage/src/test/
+/home
+/screen-api/screen-api.iml
+/screen-job/screen-job.iml
+/screen-common/screen-common.iml
+/screen-manage/screen-manage.iml
\ No newline at end of file

--
Gitblit v1.8.0