Merge remote-tracking branch 'origin/dev' into dev

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 .gitignore

@@ -26,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