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

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

 .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