From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 22 六月 2025 22:47:02 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java index 978a08e..baa26ae 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java @@ -66,7 +66,6 @@ .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate()) .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace()) .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime()) - .between(zSecret.getVHappenStartTime() != null && zSecret.getVHappenEndTime() != null, ZSecret::getValidityDate, zSecret.getVHappenStartTime(), zSecret.getVHappenEndTime()) .orderByDesc(ZSecret::getCreateTime); return lqw; } -- Gitblit v1.9.1