From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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..a9fef54 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 mon,int id);
+
}
--
Gitblit v1.8.0