From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
index e958ad7..6ac6918 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
@@ -12,6 +12,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 会员服务
  * @author ruoyi
@@ -35,10 +37,14 @@
     @PostMapping("/vip/getInfo1")
     R<TVip> getInfo1(@RequestParam("id") Integer id);
 
-
+    @PostMapping("/vip/getAllVip")
+    R<List<TVip>> getAllVip();
     @PostMapping(value = "/vip/getInfo")
     R<TVip> getInfo(@RequestParam("id") Integer id);
 
     @PostMapping(value = "/t-app-user/user/give/vip")
     R giveVip(@RequestBody GiveVipDto giveVipDto);
+
+    @GetMapping(value = "/vip/getVipList")
+    R<List<TVip>> getVipList();
 }

--
Gitblit v1.7.1