Merge branch 'master' into pay_master

zhaoxiaohao

2020-09-21 37781bdea9b06d42eaae0df34591697b290ae20c

 .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,7 @@
/build/
 
### VS Code ###
.vscode/
.vscode/
/kidgrow-web/kidgrow-web-manager/src/main/resources/static/package-lock.json
/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip
/git