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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

@@ -199,7 +199,7 @@
        <if test="organizationId !=null">
            AND organization_id = #{organizationId}
        </if>
           and mac LIKE "%"#{mac}"%" AND is_delete = 0
           and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
        union
        SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device  as sd
        WHERE 1=1