From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/.gitignore b/.gitignore
index f112f7f..ca503f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,24 @@
 # 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-common/target/
+/screen-manage/target/
+/.idea/
+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
+/screen-manage/src/main/resources/application-local.yml
+/screen-job/src/main/resources/application-local.yml
+/screen-api/src/main/resources/application-dev.yml
+
+/**/*.iml
+/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
+/**/target
+/screen.iml

--
Gitblit v1.8.0