From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 23233a7..3f30914 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,6 +36,10 @@
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);
List<Map<String, Object>> selectDeviceIdAndName();
--
Gitblit v1.9.3