From c21c161bc5ecddbe2a1d5174c2d178d768939e17 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 26 Jan 2024 09:56:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/service/DeviceService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/DeviceService.java b/screen-job/src/main/java/com/moral/api/service/DeviceService.java
index 7e15c10..afe166d 100644
--- a/screen-job/src/main/java/com/moral/api/service/DeviceService.java
+++ b/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 endTime,int id);
+
 }

--
Gitblit v1.8.0