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

houruijun

2020-08-13 d526d571cbe0a950e777fb325978d72f3ddb302b

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