Merge remote-tracking branch 'origin/master'

jiangping

2023-12-18 39969f50f23ae92c5fc25005d8d367eea0570c31

 server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java

@@ -103,5 +103,5 @@
     * @param pageWrap 分页对象
     * @return PageData<DeviceEvent>
     */
    PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap);
    PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap);
}