Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev

疯狂的狮子li

2021-04-22 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java

@@ -14,7 +14,7 @@

import java.util.concurrent.TimeUnit;

@EnableFeignClients
@EnableFeignClients("com.ruoyi.**.feign")
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)