From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index acdebfa..4a8ab4e 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -1,5 +1,6 @@
package com.moral.api.service;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
import org.springframework.web.multipart.MultipartFile;
import java.text.ParseException;
@@ -27,6 +28,7 @@
//���������������
List<Map<String, Object>> carTrajectory(Map<String, Object> params,boolean type);
+ List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params);
/**
* @Description: ������mac������������������������
--
Gitblit v1.8.0