From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 4c3684d..5f5ea10 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -39,7 +39,6 @@
<result property="qualityTraceability" column="quality_traceability"/>
<result property="specifications" column="specifications"/>
<result property="unit" column="unit"/>
- <collection property="children" resultMap="threeMap" javaType="List"/>
</resultMap>
<select id="chooseMater" resultMap="oneMap">
select s.proname prname,
@@ -63,6 +62,7 @@
<id property="name" column="order_number"/>
<result property="customerName" column="customer_name"/>
<result property="projectName" column="project_name"/>
+ <result property="techId" column="tech_id"/>
<result property="qualityTraceability" column="quality_traceability"/>
<result property="materialCode" column="material_code"/>
<result property="material" column="material"/>
@@ -91,6 +91,7 @@
select order_number,
customer_name,
project_name,
+ tech_id,
quality_traceability,
material_code,
material,
--
Gitblit v1.9.3