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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

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

@@ -25,6 +25,9 @@
    //获取监测因子趋势图数据
    List<Map<String, Object>> getTrendChartData(Map<String,Object> params);

    //获取监测因子趋势图数据第二版
    List<Map<String, Object>> getTrendChartDataV2(Map<String,Object> params);

    //通过mac获取设备信息
    Device getDeviceByMac(String mac);