From ac9ba01f811d9755204a82bd7bd9a444139711fd Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 10 三月 2025 09:49:05 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev

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

diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
index 82ede85..68c5a1b 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -9,7 +9,7 @@
                          when
                              io.type_source = 0
                              then io.sample_view
-                         else io.sample end                            sample,
+                         else io.sample end                            sampleStr,
                      GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
               from ins_order io
                        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id

--
Gitblit v1.9.3