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

jinpengyong

2023-09-05 ba9c4bca1bdf36f827ab258222d92c885ff890db

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

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

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}