From e50e03e296a2456836afbb7f6bee461ee7bddd05 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 22 Oct 2020 10:37:41 +0800
Subject: [PATCH] 修改因合并版本造成代码丢失的问题

---
 .gitignore |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c593aa..2af840c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,32 @@
-.idea/compiler.xml
-.idea/compiler.xml
-.idea/workspace.xml
-.idea/compiler.xml
-.idea/workspace.xml
-.idea/workspace.xml
-kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/filecenter/config/FeignMultipartConfig.class
-kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory$1.class
-kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory$1.class
-kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory.class
-kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/SmsChuangLanService.class
-*.class
-*.jar
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+/*/target/
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+ 
+### IntelliJ IDEA ###
 .idea
-/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip
+*.iws
+*.iml
+*.ipr
+ 
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+ 
+### VS Code ###
+.vscode/
 /kidgrow-web/kidgrow-web-manager/src/main/resources/static/package-lock.json
+/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip
+/git

--
Gitblit v1.8.0