From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 25 五月 2024 09:39:30 +0800
Subject: [PATCH] 解决冲突

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
index c58028c..ef5c719 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
@@ -2,7 +2,6 @@
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.GoodsSku;
 import com.ruoyi.system.api.domain.MemberAddress;
 import com.ruoyi.system.api.factory.MemberFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;

--
Gitblit v1.7.1