From 3fd5bd656683c482141b13cfdb953d17ba377f1f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 09:50:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into hckx
---
src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
index dabc4f0..06202f8 100644
--- a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -35,8 +35,8 @@
from documentation_return_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
where dbm.returner IS NOT NULL
- <if test="documentationReturnManagement.returnStatus != null">
- and return_status = #{documentationReturnManagement.returnStatus}
+ <if test="documentationReturnManagement.borrowStatus != null">
+ and borrow_status = #{documentationReturnManagement.borrowStatus}
</if>
<if test="documentationReturnManagement.documentationId != null">
and documentation_id = #{documentationReturnManagement.documentationId}
--
Gitblit v1.9.3