From b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 27 八月 2024 17:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 5192c06..e0a0fae 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -144,7 +144,7 @@
 
     @ApiOperation(value = "会员信息", tags = {"小程序-个人中心"})
     @PostMapping("/vipInfo")
-    public AjaxResult vipInfo() {
+    public AjaxResult<VipInfoDto> vipInfo() {
         List<VipInfoDto> vipInfoDtos = new ArrayList<>();
         List<TVip> vips = vipService.lambdaQuery().eq(TVip::getReveal, 1).list();
         for (TVip vip : vips) {

--
Gitblit v1.7.1