From 76f834a60cd35247b18e9bc9f53ee6dcf2ad08ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 16:53:25 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
index caaa404..a09519a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordIntervals;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordIntervalsService extends IService<ManageRecordIntervals> {
- Map<String,Object> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals);
+ IPage<ManageRecordIntervals> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals);
String exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response);
--
Gitblit v1.9.3