From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 4 ++++
1 files changed, 4 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 b5b3bd8..c231777 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
@@ -43,6 +43,10 @@
//���������������������������mac������
List<String> getMacsByOrganizationId(Integer organizationId);
+ //���������������������������mac������
+ List<String> getMacMonitorPointId(Integer monitorPointId);
+
+
//������������������,���������������������������mac������
List getMacsByOrgIdAndRegionCode(Integer organizationId,Integer regionCode);
--
Gitblit v1.8.0