From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-api/src/main/java/com/moral/api/service/DustldService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/DustldService.java b/screen-api/src/main/java/com/moral/api/service/DustldService.java
index c000340..cbb90cb 100644
--- a/screen-api/src/main/java/com/moral/api/service/DustldService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DustldService.java
@@ -7,6 +7,8 @@
 import java.util.Map;
 
 import com.moral.api.entity.Dustld;
+import com.moral.api.entity.SecondCruiserSort;
+
 
 public interface DustldService {
 
@@ -26,6 +28,7 @@
 
     List<Dustld>  selectAll(Map<String, Object> params);
 
-
+    //������������
+    List<SecondCruiserSort> sort(String mac, String startTime, String endTime);
 
 }

--
Gitblit v1.8.0