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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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

@@ -87,8 +87,12 @@
    Map<String,Object>  detail(String mac,String startTime,String endTime, String type);



    Map<String,Object> getStart(Integer organizationId);
    /**
     * 设备在线率
     * @param macs
     * @return
     */
    Map<String,Object> getStart(List<String> macs);


    Map<String,Object>  detailV1(String mac,String startTime,String endTime, String type);