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

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

 screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java

@@ -22,6 +22,8 @@
 */
public interface DeviceMapper extends BaseMapper<Device> {

    IPage<DeviceVO> selectAllDeviceInfo(Page<DeviceVO> page, @Param("ew") QueryWrapper<DeviceVO> queryWrapper);
    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}