From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 4 +++-
1 files changed, 3 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..e67f393 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);
@@ -73,4 +73,6 @@
**/
List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);
+ void setRedisDevice();
+
}
--
Gitblit v1.8.0