From 0bad58cb6d46ec5c111d3adaee11337c5ccd5d9c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 29 Sep 2020 11:29:51 +0800
Subject: [PATCH] Merge branch 'dev' into pay_master

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

diff --git a/.gitignore b/.gitignore
index 90005e6..2af840c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,7 @@
 /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

--
Gitblit v1.8.0