From d0e96daddf8d06900c468ee71a8ee4f14fc1c980 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 10:28:10 +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 76d2e6b..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
@@ -130,7 +130,7 @@
                         .last("LIMIT 1")));
             case 2:
                 return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
-                        .eq(TVip::getReveal,1)
+                        .eq(TVip::getReveal,1).eq(TVip::getType,1)
                         .orderByAsc(TVip::getMonthlyCard)
                         .last("LIMIT 1")));
             default:

--
Gitblit v1.7.1