Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812

cjl

2023-08-18 239927b057f65a040594f7a4cb08c8881b303797

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

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

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}