From 392e598a4975fb55a3957a40a23562e32a996cfc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 13:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
index d7d820a..71f60cf 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -40,8 +40,8 @@
     private VipSettingService vipSettingService;
     @Resource
     private TokenService tokenService;
-    @Resource
-    private VipGoodClient vipGoodClient;
+//    @Resource
+//    private VipGoodClient vipGoodClient;
 
 
     @GetMapping("getVipLevelList")
@@ -145,8 +145,8 @@
     private Map<Integer, R<List<VipGood>>> getVipGoods(List<Integer> vipIds) {
         Map<Integer, R<List<VipGood>>> result = new HashMap<>();
         for (Integer vipId : vipIds) {
-            R<List<VipGood>> vipGoodR = vipGoodClient.getVipGoodsByVipId(vipId);
-            result.put(vipId, vipGoodR);
+//            R<List<VipGood>> vipGoodR = vipGoodClient.getVipGoodsByVipId(vipId);
+//            result.put(vipId, vipGoodR);
         }
         return result;
     }

--
Gitblit v1.7.1