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

jinpengyong

2023-08-22 6eb8f65d4a69a550945a92cc916d3c63dee739fa

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

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

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}