From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 8da494e..e58d369 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -48,6 +48,14 @@
where state = 1
and device_status in (1, 5)
</select>
+
+ <!--鍘熸潗鏂欐楠�-閫夋嫨璁惧-->
+ <select id="chooseDevice" resultType="java.util.Map">
+ select id, name
+ from mom_ocean.device
+ where state = 1
+ and device_status in (1, 5)
+ </select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
update mom_ocean.device
--
Gitblit v1.9.3