From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 29 十一月 2024 16:37:02 +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 82d8443..5543b93 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 @@ -1,6 +1,12 @@ package com.ruoyi.other.controller; +import com.ruoyi.account.api.model.AppUser; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.other.api.domain.VipSetting; +import com.ruoyi.other.service.VipSettingService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.VipSetting; import com.ruoyi.other.service.VipSettingService; @@ -10,6 +16,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; import javax.annotation.Resource; @@ -27,6 +36,13 @@ public class VipSettingController { @Resource private VipSettingService vipSettingService; + @PostMapping("/info") + @ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页"}) + public R<List<VipSetting>> info(){ + List<VipSetting> list = vipSettingService.list(); + return R.ok(list); + } + @GetMapping("getVipSettingById") @ApiOperation(value = "获取会员设置") -- Gitblit v1.7.1