From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderClient.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderClient.java
index 362df6f..1bfdb19 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderClient.java
@@ -1,17 +1,24 @@
-package feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import factory.RemoteOrderFallbackFactory;
-import model.Order;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * 订单远程调用接口
- * @author luofl
- */
-@FeignClient(contextId = "RemoteOrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteOrderFallbackFactory.class)
-public interface RemoteOrderClient {
-}
+//package feignClient;
+//
+//import com.ruoyi.common.core.constant.ServiceNameConstants;
+//import com.ruoyi.common.core.domain.R;
+//import factory.RemoteOrderFallbackFactory;
+//import model.Order;
+//import model.OrderGood;
+//import org.springframework.cloud.openfeign.FeignClient;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import java.util.List;
+//
+///**
+// * 订单远程调用接口
+// * @author luofl
+// */
+//@FeignClient(contextId = "RemoteOrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteOrderFallbackFactory.class)
+//public interface RemoteOrderClient {
+//
+//
+//}

--
Gitblit v1.7.1