Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-15 a9780c49f8cf587af26cc83d439320ad02b8668f

 ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.work.mapper.ArdDroneInfoMapper">
    
    <resultMap type="ArdDroneInfo" id="ArdDroneResult">
    <resultMap type="ArdDroneInfo" id="ArdDroneInfoResult">
        <result property="id"    column="id"    />
        <result property="boxSn"    column="box_sn"    />
        <result property="boxName"    column="box_name"    />
@@ -51,7 +51,7 @@
        from ard_drone_info
    </sql>

    <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneResult">
    <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneInfoResult">
        <include refid="selectArdDroneVo"/>
        <where>  
            <if test="boxSn != null  and boxSn != ''"> and box_sn = #{boxSn}</if>
@@ -64,11 +64,11 @@
        </where>
    </select>
    
    <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneResult">
    <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneInfoResult">
        <include refid="selectArdDroneVo"/>
        where id = #{id}
    </select>
    <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneResult">
    <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneInfoResult">
        <include refid="selectArdDroneVo"/>
        where box_sn = #{boxSn}
    </select>