Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 .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