Merge remote-tracking branch 'origin/master'

jiangping

2023-12-14 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192

 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);
}