From ba9c4bca1bdf36f827ab258222d92c885ff890db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
index d2cc47c..2100d71 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
@@ -204,7 +204,7 @@
queryWrapper.eq("coordinate_id",coordinateId);
String time1 = params.remove("time1").toString();
String time2 = params.remove("time2").toString();
- long l = DateUtils.compareDateStr(time1, time2);
+ long l = DateUtils.compareDateStrDay(time1, time2);
if (l>0){
params.put("time1",time1);
params.put("time2",time2);
--
Gitblit v1.8.0