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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

1
E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-business\kidgrow-usercenter\kidgrow-usercenter-server\src\test\java\com\kidgrow\usercenter\HospitalMapperTest.java