From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml b/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml
index c8f70af..9662709 100644
--- a/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml
@@ -178,7 +178,8 @@
is2.model,
GROUP_CONCAT(DISTINCT ip.inspection_item SEPARATOR ' ') AS product,
-- sm.code standardMethodList,
- '璇曢獙瑕佹眰' standardMethodList,
+-- '璇曢獙瑕佹眰' standardMethodList,
+ ip.method_s standardMethodList,
GROUP_CONCAT(DISTINCT ip.tell SEPARATOR ' ;') AS groupConcatTell,
is2.remark
from ins_order io2
@@ -194,7 +195,8 @@
select is2.sample_code sampleNumber,
is2.model,
GROUP_CONCAT(DISTINCT ip.inspection_item SEPARATOR ',') AS testItem,
- sm.code testStandard,
+-- sm.code testStandard,
+ ip.method_s testStandard,
is2.remark
from ins_sample is2
left join standard_method sm on standard_method_list_id = sm.id
--
Gitblit v1.9.3