From 940dd1b292db4c5cc2df2f137fa46c37f2159898 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 f6515b0..8f73394 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
@@ -2,26 +2,18 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.VipGood;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.service.VipGoodService;
import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.VipSetting;
-import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import javax.annotation.Resource;
import java.util.List;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -44,9 +36,8 @@
@Resource
private VipGoodService vipGoodService;
- @PostMapping("/info")
- @ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页", "小程序-会员中心"})
- public R<List<VipSetting>> info() {
+ @GetMapping("/list")
+ public R<List<VipSetting>> list() {
List<VipSetting> list = vipSettingService.list();
return R.ok(list);
}
--
Gitblit v1.7.1