Merge remote-tracking branch 'origin/master'

rain

2026-01-09 31eda012c6f3388f1c7441951a250b54c046e7ea

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml

@@ -18,6 +18,8 @@
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
@@ -31,6 +33,8 @@
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        from
        ja_fw_device_scrap a
@@ -55,6 +59,8 @@
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        from
        ja_fw_device_scrap a