Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

 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);
                });
            });