From 2ba93435afce9b04a5247739041902861b20596c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 24 Oct 2023 10:24:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
index 0f56b49..f4f0bad 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -32,4 +32,6 @@
 
     List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);
 
+    List<String> deviceMacs(@Param("organizationId") int organizationId);
+
 }

--
Gitblit v1.8.0