Merge remote-tracking branch 'origin/master'

jiangping

2023-12-14 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192

 server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java

@@ -6,7 +6,6 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.DeviceEventQuery;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.service.business.DeviceEventService;
@@ -72,7 +71,7 @@
    @ApiOperation("分页查询")
    @PostMapping("/page")
    //@RequiresPermissions("business:deviceevent:query")
    public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEventQuery> pageWrap) {
    public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
        return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
    }