From a1e19c7466cce45b5bb360e38ab7c7c1753986f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 15:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

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

diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index df67330..7e3191d 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -417,13 +417,13 @@
         iiq.part_desc,
         iiq.lot_batch_no,
         iiq.part_no,
+        iiq.inspect_status as ins_state,
         ippr.insulation_color,
         ippr.outer_color,
         ippr.drum_no,
         ippr.start_meter_mark,
         ippr.end_meter_mark,
         io.update_time,
-        io.ins_state,
         -- 妫�楠屼汉鏌ヨ锛氫紭鍏堝彇鎸囨淳鐨勮礋璐ｄ汉锛屽鏋滄病鏈夊垯鍙栬鍗曞垱寤轰汉
         COALESCE(isu.userName, u.name) AS inspector_name
         FROM ifs_inventory_quantity iiq

--
Gitblit v1.9.3