From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 1c6c3a0..5f5ea10 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -62,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"/>
@@ -90,6 +91,7 @@
         select order_number,
                customer_name,
                project_name,
+               tech_id,
                quality_traceability,
                material_code,
                material,

--
Gitblit v1.9.3