From 035ff4e0ea0e65da8631e940d9dd2312d3c38dee Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 15 七月 2024 14:05:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl b/_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl
index e4d6bb3..8ec6afe 100644
--- a/_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl
+++ b/_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl
@@ -5,11 +5,11 @@
   Date end1,
   Date start2,
   Date end2
-) const declarative as Boolean
+) const declarative remote as Boolean
 {
   TextBody:
   [*
     // rislai Jun-14-2024 (created)
-    return start1 < end2 and start2 < end1 ;
+    return start1 <= end2 and start2 <= end1 ;
   *]
 }

--
Gitblit v1.9.3