From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 15 Dec 2020 14:08:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/DeviceService.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java index 06e5674..28038d1 100644 --- a/src/main/java/com/moral/service/DeviceService.java +++ b/src/main/java/com/moral/service/DeviceService.java @@ -86,4 +86,11 @@ List<Device> getDeviceByCodeAndId(String code,String id); String byMacGetOrgId(String mac); + //������mac������������������������������������ + List<Device> getDevice(String macOrName); + + List<Device> getDeviceByCode(); + + List<Device> getDevicesByAccountId(String id); + } -- Gitblit v1.8.0