Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

liukangdong

2024-12-06 cb54e068db9d9816ae38f60f57ad0fe7ca10fca8

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

@@ -180,6 +180,7 @@
                        .ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
                        .le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
                        .eq(YwDeviceRecord::getIsdeleted,Constants.ZERO)
                        .orderByDesc(YwDeviceRecord::getCreateDate)
        );
        return PageData.from(iPage);
    }