From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev

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

diff --git a/.gitignore b/.gitignore
index 5c43452..d4d3365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-.idea/compiler.xml
-.idea/compiler.xml
-.idea/workspace.xml
 HELP.md
 /target/
 !.mvn/wrapper/maven-wrapper.jar
@@ -29,4 +26,8 @@
 /build/
  
 ### VS Code ###
-.vscode/
\ No newline at end of file
+.vscode/
+/kidgrow-web/kidgrow-web-manager/src/main/resources/static/package-lock.json
+/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip
+/git
+/kidgrow-web/kidgrow-web-manager/src/main/resources/static.rar

--
Gitblit v1.8.0