From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001 From: cjl <chenjl@deyt.cn> Date: Wed, 12 Jul 2023 20:24:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev --- 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