From ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 25 七月 2025 14:54:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml index d967f14..0593f6d 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml @@ -8,7 +8,10 @@ e.equipment_code, e.equipment_name, e.equipment_model, - e.installation_position + e.installation_position, + wmo.scrap_part_number, + wmo.scrap_part_quantity, + wmo.scrap_part_value FROM eam_report_accidents_register aar LEFT JOIN eam_report_repair wmo ON aar.report_id = wmo.id -- Gitblit v1.9.3