From cdd9ef5944a1cda82d98f1544fb451c7dd4f8c3d Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:20:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-device/src/main/resources/mapper/DeviceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
index 8009a5a..b84746b 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
@@ -97,7 +97,7 @@
cmr.calibration_date as last_calibration_date_two,
cmr.next_calibration_date as next_calibration_date_two,
GROUP_CONCAT(distinct inspection_item SEPARATOR ';') AS insProductItem,
- u.name ,
+ u.name AS equipment_manager_user,
sd.dept_name AS laboratory_name
FROM
device d
--
Gitblit v1.9.3