From 89a874ad57ff876070bd9a032cd9113facadb758 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 15:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 14d23b5..8468395 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -186,7 +186,7 @@
     }
 
     @Override
-    public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
+    public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
 
         //鏄惁鏄暟瀛�
         boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());

--
Gitblit v1.9.3