From afacb4a693c3b7e40ccdd55bc403850709ff8a34 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 10:08:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 8861c9c..6270d57 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -361,9 +361,9 @@
<select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
t1.*,
- t2.model as product_category ,
+ t2.model as specification_model ,
t2.unit,
- t3.product_name
+ t3.product_name as product_category
from procurement_record_storage t1
left join product_model t2 on t1.product_model_id = t2.id
left join product t3 on t2.product_id = t3.id
--
Gitblit v1.9.3