From f979b967a74bfdbfe7d2913a35ba98344838e59b Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 14 Sep 2023 12:56:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java index fd65fa6..10b8016 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java @@ -161,6 +161,7 @@ dateMap.put("startTime", slotStartDate); dateMap.put("endTime", slotEndDate); dateMap.put("batch", mKey); + dateMap.put("total",mValue.size()); timeSlots.add(dateMap); }); }); -- Gitblit v1.8.0