From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
index 87e0db0..82d9a99 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
@@ -82,7 +82,7 @@
      * @param query
      * @return
      */
-    Page<MwStorageRecordVO> temporarilyStoredMedicalWaste(StorageRecordQuery query);
+    Page<MwStorageRecordVO> temporarilyStoredMedicalWaste(Page<MwStorageRecordVO> page, @Param("query") StorageRecordQuery query);
 
     /**
      * 根据医废查询使用列表

--
Gitblit v1.7.1