From 691c663dc5624e0dc2115a69f380087fb9ac16a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 2 ++
1 files changed, 2 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 da3798d..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
@@ -158,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