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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

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

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

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

}