From 2b5e23042827c66c936d6aeaa004f42b95236d52 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 31 Jul 2023 13:10:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java
index c182c07..f0731ae 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java
@@ -49,9 +49,8 @@
)
return false;
//������������������������������������
- List<Date> dates = DateUtils.dateToStartAndEndTime(date);
- startDate = dates.get(0);
- endDate = dates.get(1);
+ startDate = DateUtils.getDailyStartTime(date);
+ endDate = DateUtils.getDailyEndTime(date);
return true;
}
}
--
Gitblit v1.8.0