Merge remote-tracking branch 'origin/master'

linwei

2026-01-19 1f9f5596657af4af7e4e7da735358a0f00d64bbc

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

@@ -78,6 +78,9 @@
                    #{item}
                </foreach>
            </if>
            <if test="param2.status != null">
                and status = #{param2.status}
            </if>
        </where>
    </select>

@@ -121,6 +124,9 @@
                    </choose>
                )
            </if>
            <if test="status != null">
                and status = #{status}
            </if>
        </where>
    </select>