From 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 14:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/service/DeviceService.java | 2 +-
1 files changed, 1 insertions(+), 1 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 afe166d..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
@@ -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);
}
--
Gitblit v1.8.0