From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-manage/src/main/java/com/moral/api/service/DeviceService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 e22ba74..e8fd83c 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
@@ -64,4 +64,13 @@
     //���������������������������
     void judgeDeviceState(Map<String, Object> data);
 
+    /**
+      *@Description: ������������id���������������������
+      *@Param: [orgId]
+      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
+      *@Author: lizijie
+      *@Date: 2022/1/17 10:30
+     **/
+    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);
+
 }

--
Gitblit v1.8.0