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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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