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

疯狂的狮子li

2021-05-31 f3aaa7ea7a0f56ff4a6f9faf057a6595ab3275a7

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

@@ -19,7 +19,7 @@
 *
 * @author Lion Li
 */
@EnableFeignClients("com.ruoyi.**.feign")
@EnableFeignClients("${feign.package}")
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)