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

houruijun

2020-10-29 967f911721e3a7473ac9d6c90e533453751f3243

 .gitignore

@@ -30,3 +30,4 @@
/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