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

houruijun

2020-08-21 cdf8f1e691531a6fb1c3462d0ad70df7f68c0047

1
2
E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-demo\kidgrow-demo-order\src\test\java\com\kidgrow\order\mapper\OrderTestMapperTest.java
E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-demo\kidgrow-demo-order\src\test\java\com\kidgrow\order\mapper\OrderInfoMapperTest.java