From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 eaeb459..d1f92f3 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
@@ -92,7 +92,7 @@
@GetMapping("getVipSettingById")
@ApiOperation(value = "获取会员设置")
- public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam Integer id) {
+ public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam("id") Integer id) {
return R.ok(vipSettingService.getById(id));
}
@@ -106,6 +106,11 @@
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());
+ }
}
--
Gitblit v1.7.1