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

cjl

2023-07-06 4434ac67c79a51525b57f4b2020d24678a2b3f73

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

@@ -24,4 +24,6 @@

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}