Merge remote-tracking branch 'origin/master'

lishuai

2023-12-14 7d1abc56db2b67657070016c19640f815f627994

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

@@ -300,7 +300,7 @@
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
                            Member::getType,
                            pageWrap.getModel().getMemberType())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                            CarEvent::getEventType,
                            pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),