From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 9 +++++++++
1 files changed, 9 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 c7f9387..73b3308 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
@@ -113,6 +113,13 @@
}
+ @PostMapping("getVipSettingById1")
+ public R<VipSetting> getVipSettingById1(@RequestParam("id") Integer id) {
+ return R.ok(vipSettingService.getById(id));
+ }
+
+
+
/**
* 查询会员配置
* @param id
@@ -151,6 +158,8 @@
vipSetDto.setPartPoint(new BigDecimal(base1.getContent()));
BaseSetting base2 = baseSettingService.getById(2);
vipSetDto.setBottomPartPoint(new BigDecimal(base2.getContent()));
+ BaseSetting base3 = baseSettingService.getById(3);
+ vipSetDto.setVipInfo(base3.getContent());
return R.ok(vipSetDto);
}
--
Gitblit v1.7.1