From 72f1897ad39638eee7a22b28477b28e99accfc7f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 15:16:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 13 ++++++++++++-
1 files changed, 12 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 4af566f..ceb74b9 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,18 @@
@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));
+ }
+
+
+ /**
+ * 查询会员配置
+ * @param id
+ * @return
+ */
+ @PostMapping("/getVipSetting")
+ public R<VipSetting> getVipSetting(@RequestParam("id") Integer id) {
return R.ok(vipSettingService.getById(id));
}
}
--
Gitblit v1.7.1