Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-02-29 34c5df174a03341fa469a5196410205cebc26b82

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

@@ -85,4 +85,11 @@
     * @return
     */
    Map<String,Object>  detail(String mac,String startTime,String endTime, String type);



    Map<String,Object> getStart(Integer organizationId);


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