Merge remote-tracking branch 'origin/master'

k94314517

2024-03-18 52f8e08715abd234c3bd6908e4338b1da1d8b0b4

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

@@ -258,7 +258,7 @@
            queryWrapper.lambda().eq(DeviceEvent::getIssuingAuthority, pageWrap.getModel().getIssuingAuthority());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(DeviceEvent::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(DeviceEvent::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSex() != null) {
            queryWrapper.lambda().eq(DeviceEvent::getSex, pageWrap.getModel().getSex());