From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

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

diff --git a/.gitignore b/.gitignore
index 32858aa..5967eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,14 @@
 .mtj.tmp/
 
 # Package Files #
+*.iml
 *.jar
 *.war
 *.ear
+*.log
+
+.idea
+target
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

--
Gitblit v1.9.2