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

cjl

2023-09-12 87c10f8ad1cd11d126dabeea6071cdee617dbfa5

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

@@ -19,6 +19,8 @@
    //根据站点id获取设备列表
    List<Device> getDevicesByMonitorPointId(Integer monitorPointId);

    List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId);

    //根据macs获取公有因子信息
    Map<String, Object> getSensorsByMac(Map<String,Object> params);