From 81906f3e78bb07425e5c4324423ca88253d889ac Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 23 五月 2026 13:33:30 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西坤源化工
---
src/main/resources/mapper/sales/SalesQuotationMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index cf15b63..5448933 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -9,7 +9,7 @@
FROM sales_quotation t1
LEFT JOIN approve_process t2 ON t1.quotation_no = t2.approve_reason and t2.approve_type = 6
WHERE 1=1
- and t2.approve_deleted = 0
+ and t2.approve_delete = 0
<if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
</if>
@@ -20,4 +20,4 @@
AND t1.status = #{salesQuotationDto.status}
</if>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3