From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index 43d22bb..acc64f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -46,9 +46,11 @@
             t1.status,
             t5.item_text as statusName,
             t1.num,
+            t1.num as technologyStatusVerificationBill,
             t4.id as maintenanceCycleId,
             t4.maintenance_type as maintenanceType,
             t10.item_text as maintenanceTypeName,
+            t4.cycle as maintenanceCycle,
             concat(t4.code, '/', t4.name) as maintenanceCycleName,
             t3.id as equipmentId,
             t3.num as equipmentNum,

--
Gitblit v1.9.3