From 4eeb403ab81c2cd88e2f8004913afff64f0142e3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:01 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段; 供应商档案增加供应商类型字段,由字典维护;

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..317f5d9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -97,5 +97,14 @@
 
         ORDER BY pm.id DESC
     </select>
+    <select id="getProductAndModelList" resultType="java.util.Map">
+        select p.id as id,
+               pm.id as modelId,
+               p.product_name as productName ,
+               pm.model as  model
+        from product_model pm
+        left join product p on p.id = pm.product_id
+        order by p.id,pm.id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3