From 34c5df174a03341fa469a5196410205cebc26b82 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 29 Feb 2024 10:03:34 +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/impl/DeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 8f258a8..b7b5c69 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -77,7 +77,7 @@
}
@Override
- public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
- return this.baseMapper.ListDeviceExcel(startTime,id);
+ public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String mon, int id) {
+ return this.baseMapper.ListDeviceExcel(startTime,mon,id);
}
}
\ No newline at end of file
--
Gitblit v1.8.0