From 87cd64e4663bcdb1ff8c649560eb98bc2c5fe597 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiwnagwbs@163.com>
Date: Wed, 9 May 2018 22:49:17 +0800
Subject: [PATCH] merge

---
 .gitignore | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index be93dac..337bea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,33 @@
 ### springboot多模块 #####################
 
-logs
-*/target
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+*/.project
+*/.classpath
+*/.settings
+
 ### IntelliJ IDEA ###
 .idea
-*.iml
 *.iws
+*.iml
 *.ipr
 */*.iml
+
 ### maven ###
 mvnw
 mvnw.cmd
 .mvn
-### eclipse ###
-.settings
-*/.project
-*/.classpath
-*/.settings
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file