From b5a2fc07527ab700544f3b7ba0be01b2e015e2db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 04 Aug 2023 08:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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