From 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 25 Jun 2025 16:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/utils/timeutil/TimeUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/utils/timeutil/TimeUtil.java b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
index 07218d4..b87dc8b 100644
--- a/src/main/java/com/nq/utils/timeutil/TimeUtil.java
+++ b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
@@ -16,7 +16,7 @@
}
- if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
+ if(now.isAfter(pmTime) && now.isBefore(pmTime1)){
return true;
}
return false;
--
Gitblit v1.9.3