From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
index cb516f2..5776e85 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
@@ -27,13 +27,13 @@
private CancelledClassesMapper cancelledClassesMapper;
@Override
- public List<CancelClassesVO> listAll(CancelClassesQuery query) {
+ public List<CancelClassesVO> listAll(CancelClassesQuery query, List<Integer> collect) {
String STime = null;
String ETime = null;
if (StringUtils.hasLength(query.getTime())) {
STime = query.getTime().split(" - ")[0] + " 00:00:00";
ETime = query.getTime().split(" - ")[1] + " 23:59:59";
}
- return cancelledClassesMapper.listAll(query,STime,ETime);
+ return cancelledClassesMapper.listAll(query,STime,ETime,collect);
}
}
--
Gitblit v1.7.1