From 65ce2c100b2c65d017f878b679c731816b196a9a Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Thu, 12 Feb 2026 15:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E8=83=BD=E5=8A=9B=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/basic/controller/CraftAbilityController.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
index dd6495b6..50279f6e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
@@ -118,8 +118,10 @@ public class CraftAbilityController extends BladeController {
 		Date startTime = null;
 		Date endTime = null;
 		if(craftAbility.containsKey("startTime")){
-			startTime = DateUtil.parse(Func.toStr(craftAbility.get("startTime")),"yyyy-MM-dd HH:mm:ss");
-			endTime = DateUtil.parse(Func.toStr(craftAbility.get("endTime")),"yyyy-MM-dd HH:mm:ss");
+			String startTimeStr = Func.toStr(craftAbility.get("startTime"))+" 00:00:00";
+			String endTimeStr = Func.toStr(craftAbility.get("endTime"))+" 23:59:59";
+			startTime = DateUtil.parse(startTimeStr,"yyyy-MM-dd HH:mm:ss");
+			endTime = DateUtil.parse(endTimeStr,"yyyy-MM-dd HH:mm:ss");
 		}