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/impl/DeviceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 0ecca0e..8f258a8 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
@@ -78,6 +78,6 @@
@Override
public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
- return this.baseMapper.ListDeviceExcel(startTime,endTime,id);
+ return this.baseMapper.ListDeviceExcel(startTime,id);
}
}
\ No newline at end of file
--
Gitblit v1.8.0