From b63d81722fa0fc56f3f6da7ccf8a294f15b8253a Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 22 七月 2025 16:30:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml index d59e70e..c6a96e2 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml @@ -52,7 +52,9 @@ ext.third_maintenance_period, ext.technology_check_period, ext.latest_technology_check, - ext.next_technology_check + ext.next_technology_check, + ext.technology_genarate_flag, + ext.third_maintenance_genarate_flag from eam_equipment e left join eam_equipment_extend ext on e.id = ext.id -- Gitblit v1.9.3