From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 2451288..4a06d81 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -25,13 +25,16 @@
     //鏍规嵁鍒嗙粍鏌ヨ璁惧鍚�
     List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);
 
-    //閫夋嫨鎵�鏈夎澶囩粍
+    //閫夋嫨鐢熶骇璁惧缁�
     List<Map<String, Object>> chooseDevGroup();
 
     //鎵归噺鍒犻櫎
     void delAllDevice(String ids);
 
-    //鍘熸潗鏂欐楠�-->閫夋嫨璁惧
+    //閫夋嫨妫�楠岃澶�
     List<Map<String, Object>> chooseDevice();
 
+    //鏂板--閫夋嫨璁惧缁�
+    List<String> listGroup(Integer type);
+
 }

--
Gitblit v1.9.3