From 44e2cc3deb22aa0b832a2bf4f738cd98d4e9255a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 13 Oct 2025 15:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index 37ec66c..c7f2d99 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -32,7 +32,7 @@
</resultMap>
<select id="selectArdServerInfo" resultType="com.ard.work.domain.entity.ArdServerInfo">
- select * from ard_server_info where id = #{server_info_id}
+ select * from ard_server_info where id = #{serverInfoId}
</select>
<sql id="selectArdDroneVo">
@@ -68,7 +68,10 @@
<include refid="selectArdDroneVo"/>
where id = #{id}
</select>
-
+ <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneResult">
+ <include refid="selectArdDroneVo"/>
+ where box_sn = #{boxSn}
+ </select>
<insert id="insertArdDrone" parameterType="ArdDroneInfo">
insert into ard_drone_info
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3