From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 3f30914..8d58673 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -36,8 +36,6 @@
Integer deviceDelete(Integer deviceId);
- Integer deviceDeleteIdOrFather(Integer id, String deviceFather);
-
List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);
Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather);
--
Gitblit v1.9.3