From d9e5ab959b7ff2c578672938c205a7a82765ef9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 2df7ac0..4b3a118 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -16,5 +16,7 @@
  */
 public interface DeviceMapper extends BaseMapper<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);
 }

--
Gitblit v1.9.3