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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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);

}