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

jinpengyong

2024-01-31 3c0ccc88ffa8a651ec78a611ffe75775222ebf07

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

@@ -32,6 +32,6 @@
    List<Device> getDateByOrgId(int orgId);


    List<DeviceExcelDTO> ListDeviceExcel(String startTime,String endTime,int id);
    List<DeviceExcelDTO> ListDeviceExcel(String startTime,String mon,int id);

}