From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 09 Aug 2023 09:13:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
index 4ff8a79..1bb0b79 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
@@ -37,6 +37,7 @@
newMap.put("endTime",DateUtils.dateToDateString(endDate, "yyyy-MM-dd HH:mm:ss"));
//������batch������
newMap.put("batch", (String) map.get("batch"));
+ newMap.put("total",map.get("total").toString());
timeSlotVo.add(newMap);
}
vo.setTimeSlot(timeSlotVo);
--
Gitblit v1.8.0