Merge remote-tracking branch 'origin/master'

jiangping

2024-03-04 a254510ced8108c0cde37eb31a6b3e6469fcb2fb

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -277,7 +277,7 @@
                .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                        Retention::getEventDate,pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        Retention::getEventDate,pageWrap.getModel().getStartTime());
                        Retention::getEventDate,pageWrap.getModel().getEndTime());
        queryWrapper.orderByDesc(Retention::getCreateDate);
        IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
        return retentionIPage;