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

克 刘

2020-08-20 3d67c92b08cd86ec3ee9ad4044fb26144dc91fac

 kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml

@@ -116,6 +116,11 @@
            <artifactId>spring-cloud-starter-openfeign</artifactId>
            <!--            <optional>true</optional>-->
        </dependency>
        <dependency>
            <groupId>io.github.openfeign</groupId>
            <artifactId>feign-okhttp</artifactId>
            <version>10.1.0</version>
        </dependency>
        <!-- hystrix断路器 -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>