From 7b09f233bde70508f6db7e08e983e9a2c4bb3e99 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 11 八月 2023 17:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 b6e6f00..0d01479 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
@@ -30,5 +30,11 @@
@Transactional(rollbackFor = Exception.class)
Boolean addDevice(Device device);
- List<Map<String, Object>> deviceTwoTree(Integer type);
+ List<Map<String, Object>> deviceTwoTree(Integer type, String search_class);
+
+ List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);
+
+ Integer deviceDelete(Integer deviceId);
+
+ Integer deviceDeleteIdOrFather(Integer id, String deviceFather);
}
--
Gitblit v1.9.3