Merge remote-tracking branch 'origin/wb_21' into dev

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

 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);