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

kaiyu

2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b

 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();

}