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

疯狂的狮子li

2021-06-24 3eee19c9a2d7dafcb24f8fba448eff33b9558b03

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java

@@ -5,6 +5,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

/**
 * feign测试fallback
 *
 * @author Lion Li
 */
@Slf4j
@Component
public class FeignTestFallback implements FeignTestService {