From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
index 9018fe3..f9c97c4 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
@@ -38,7 +38,7 @@
 			List<TAppUserVipDetail> recentDetails = tAppUserVipDetailService.lambdaQuery()
 					.le(TAppUserVipDetail::getStartTime, currentDate)
 					.ge(TAppUserVipDetail::getEndTime, currentDate)
-					.eq(TAppUserVipDetail::getChargeNum, 0)
+					.ne(TAppUserVipDetail::getVipType, 1)
 					.le(TAppUserVipDetail::getMonthEndTime, currentDate)
 					.orderByDesc(TAppUserVipDetail::getStartTime).list();
 			for (TAppUserVipDetail recentDetail : recentDetails) {

--
Gitblit v1.7.1