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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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

@@ -2,6 +2,7 @@

import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.util.DeviceExcelDTO;

import java.util.List;

@@ -30,4 +31,7 @@
     **/
    List<Device> getDateByOrgId(int orgId);


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

}