From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
index b7762db..0fd2778 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
@@ -111,6 +111,22 @@
         return R.ok(vipSettingService.getById(id));
     }
 
+
+    /**
+     * 查询会员配置
+     * @param id
+     * @return
+     */
+    @PostMapping("/getVipSetting")
+    public R<VipSetting> getVipSetting(@RequestParam("id") Integer id) {
+        return R.ok(vipSettingService.getById(id));
+    }
+
+    @GetMapping("/list")
+    public R<List<VipSetting>> getList(){
+        return R.ok(vipSettingService.list());
+    }
+
     @GetMapping("/manage/info")
     @ApiOperation(value = "查询", tags = {"后台-会员设置"})
     public R<VipSetDto> managesetinfo() {

--
Gitblit v1.7.1