From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

---
 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