Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-13 f415ad31e5335837007f02d68b7aa1c2f2307235

 screen-manage/src/main/java/com/moral/api/service/DeviceService.java

@@ -73,4 +73,6 @@
     **/
    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);

    void setRedisDevice();

}