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-manage/src/main/java/com/moral/api/service/DeviceService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java index e8fd83c..899c7ae 100644 --- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java +++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java @@ -56,7 +56,7 @@ Map<String, Object> getDeviceByMac(String mac); //������������������ - Map<String, Object> adjustDeviceData(Map<String, Object> deviceData); + Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code); //������������������������ Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData); -- Gitblit v1.8.0