From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 07 Jul 2023 14:01:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/service/DeviceService.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java index 1bb65f1..d47bc2b 100644 --- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java +++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java @@ -25,6 +25,9 @@ //��������������������������������� List<Map<String, Object>> getTrendChartData(Map<String,Object> params); + //������������������������������������������ + List<Map<String, Object>> getTrendChartDataV2(Map<String,Object> params); + //������mac������������������ Device getDeviceByMac(String mac); -- Gitblit v1.8.0