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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml

@@ -17,4 +17,13 @@
        <result column="is_delete" property="isDelete"/>
    </resultMap>

    <select id="selectSpecialDevice" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
        SELECT id,`name`,mac,special_type FROM special_device
        WHERE 1=1
        <if test="organization_id !=null">
            AND organization_id=#{organizationId}
        </if>
           AND is_delete =0
    </select>

</mapper>