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

cjl

2023-08-18 41660a11fb793295d44a4d47949284105e429395

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

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

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();

}