From 2ac14cef837ceaa5201d6266485ab672f6f3d650 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd_new' into sqd_new
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..3b3f342 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -97,5 +97,19 @@
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>
+ <select id="listProduct" resultType="java.util.HashMap">
+ select id,product_name as name from product
+ where parent_id is null
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3