Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 4ad61e4c257621124625a89853eaa8334a11b0be

 base-server/src/main/resources/mapper/DeviceMapper.xml

@@ -30,7 +30,7 @@
        </if>
        <if test="message!=null and message!=''">
            and code like concat('%',#{message},'%')
            or name like concat('%',#{message},'%')
            or device.name like concat('%',#{message},'%')
        </if>
    </select>
    <!--根据设备分组查询设备-->