Merge remote-tracking branch 'origin/master'

k94314517

2024-02-28 74d0e4641db1ca6ae6b4d351733f721556c82bed

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

@@ -277,10 +277,10 @@
                        VisitEvent::getEventType,
                        pageWrap.getModel().getEventType())
                .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
                        VisitEvent::getHappenTime,
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getStartTime())
                .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
                        VisitEvent::getHappenTime,
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getEndTime())
                .eq(VisitEvent::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByDesc(VisitEvent::getHappenTime);