From 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 21 Aug 2024 20:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rb' into rb
---
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