From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index f52ee2b..d355e72 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -10,6 +10,7 @@
</delete>
<select id="selectItemParameterList" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
select * from (select A.id,
+ st.name as template_name,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -50,6 +51,7 @@
END AS samples
from structure_item_parameter) A
left join structure_test_object sto on samples = specimen_name
+ LEFT JOIN standard_template st ON template_id = st.id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>)B
--
Gitblit v1.9.3