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

zhaoxiaohao

2020-04-10 eab02ab1453dc1f1e9933077dde1cef67d798936

1
E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-web\kidgrow-web-manager\src\main\java\com\kidgrow\web\ManagerApplication.java