Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml

@@ -18,7 +18,7 @@
            t3.id as maintenanceCycleId,
            t3.NAME AS maintenanceCycleName,
            t5.NAME AS maintenanceSpecialtyName,
            t7.item_value as maintenanceRole
            t7.item_text as maintenanceRole
        FROM
            mom_eam_maintenance_standard_detail t1
        LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id
@@ -80,7 +80,7 @@
            t4.item_text AS maintenanceMethodName,
            t2.maintenance_tool AS maintenanceTool,
            t2.working_hour_quota AS workingHourQuota,
            concat(t3.code, '/', t3.name) as maintenanceCycleName,
            t3.name as maintenanceCycleName,
            t5.NAME AS maintenanceSpecialtyName
        FROM
            mom_eam_maintenance_standard_detail t1