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/ProductMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index 78a1353..4b9c929 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -35,4 +35,10 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="getWordQrModel" resultType="java.lang.String">
+ SELECT GROUP_CONCAT(DISTINCT isa.model) model
+ FROM ins_sample isa
+ where isa.ins_order_id = #{orderId}
+ </select>
</mapper>
--
Gitblit v1.9.3