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

cjl

2023-09-27 dc1c8c974d9469591ead4dd1d774bbfb97a33331

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

@@ -188,4 +188,8 @@
                    i.is_delete = 0
            ) t3
    </select>
    <select id="deviceMacs" resultType="java.lang.String">
        select mac from device where organization_id = #{organizationId} order by id desc

    </select>
</mapper>