From 7edf9a7c98fadade6cfd439083337634e7b80019 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 08 十二月 2023 18:22:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 72aeb5c..58d4563 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -2,7 +2,10 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.RetentionQuery;
 import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.model.TrainTime;
+
 import java.util.List;
 
 /**
@@ -14,7 +17,7 @@
 
     /**
      * 鍒涘缓
-     * 
+     *
      * @param retention 瀹炰綋瀵硅薄
      * @return Integer
      */
@@ -78,7 +81,7 @@
      * @return List<Retention>
      */
     List<Retention> findList(Retention retention);
-  
+
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -94,4 +97,7 @@
      * @return long
      */
     long count(Retention retention);
+
+
+    PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap);
 }

--
Gitblit v1.9.3