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

luliqiang

2020-06-12 abee95ff7de4b3514022b758044e77793f74896f

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