Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa

jinpengyong

2023-11-13 471f693ac87a6ed6a2b00e93472b025266c0271f

 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