From 9f8f73240c885488fdffc1062826520cf7abb86b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:45:03 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency

---
 basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 9b3ec8a..d9a1457 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -198,6 +198,7 @@
     <resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
         <result column="pId" property="id"/>
         <result column="pName" property="name"/>
+        <result column="labelName" property="labelName"/>
     </resultMap>
 
     <select id="selectItemParameterBySample" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
@@ -217,7 +218,7 @@
     </select>
 
     <select id="getItemTreeProduct" resultMap="itemDto">
-        select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName
+        select sto.id sId, sto.specimen_name sName, p.name labelName, p.id pId, p.name pName
         from structure_test_object sto
                  left join product p on p.object_id = sto.id
         WHERE sto.object_type = #{objectType}

--
Gitblit v1.9.3