Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 .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/
.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