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

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java

@@ -9,6 +9,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * feign测试controller
 *
 * @author Lion Li
 */
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/feign/test")