From 6a8e048ed345c93210a2a99989d060b4c7d464f0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 15:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index 9461c66..2c34c4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderMapper">
 
     <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamInspectionOrder">
-        select wmo.*, e.equipment_code, e.equipment_name
+        select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model
         from eam_inspection_order wmo
         inner join eam_equipment e
         on wmo.equipment_id = e.id

--
Gitblit v1.9.3