Merge remote-tracking branch 'origin/master'

lishuai

2023-12-15 3a86c9c6879971051ab1e01a5b9b88eed27e55db

 server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java

@@ -99,5 +99,5 @@
    long count(Retention retention);


    PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap);
    PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap);
}