From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Fri, 09 Aug 2024 13:38:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl --- screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java index d86dd47..4813ddb 100644 --- a/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java +++ b/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java @@ -116,7 +116,7 @@ secondCruiserSort.setValue(rsAvg); secondCruiserSort.setMac(mac); secondCruiserSort.setOrganizationId(organizationId); - secondCruiserSort.setTime(startTime); + secondCruiserSort.setTime(endTime); list1.add(secondCruiserSort); } } -- Gitblit v1.8.0