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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

 kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignInterceptorConfig.java

@@ -20,7 +20,7 @@
 */
public class FeignInterceptorConfig {
    /**
     * 使用feign client访问别的微服务时，将上游传过来的client、tenant、traceid等信息放入header传递给下一个服务
     * 使用feign client访问别的微服务时，将上游传过来的client、traceid等信息放入header传递给下一个服务
     */
    @Bean
    public RequestInterceptor baseFeignInterceptor() {