From 6c2fe039f3a0c9cfd0e84ffe83a0961bb5991d95 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:49:36 +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