From 29c0f2e4bb55bf486b7a5cf95e2ad4b215d4d281 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e4bbefa..530d2f3 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -16,11 +16,13 @@
<result column="validity_period" property="validityPeriod" />
<result column="filing_certificate_no" property="filingCertificateNo" />
<result column="uid_no" property="uidNo" />
+ <result column="parent_name" property="parentName" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
- select pm.*,p.product_name
+ select pm.*,p.product_name, parent_p.product_name as parent_name
from product_model pm
left join product p on pm.product_id = p.id
+ left join product parent_p on p.parent_id = parent_p.id
<where>
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
--
Gitblit v1.9.3