From da59bd81334e7b4ddeaaa401f27c5b93797fde46 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 20 二月 2025 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
index 9d851af..3d5b4ff 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.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.ManageRecordCancel;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordCancelService extends IService<ManageRecordCancel> {
- Map<String,Object> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel);
+ IPage<ManageRecordCancel> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel);
int ratifyManageRecordCancel(Integer id, String ratifyState);
--
Gitblit v1.9.3