Merge remote-tracking branch 'origin/master'

Lius

6 小时以前 f3a7d211a4a616d8ed2a08b103d8d162f06d389e

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

@@ -4,7 +4,7 @@

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
        select wmo.*, e.equipment_code, e.equipment_name
        from eam_second_maintenance_order wmo
        from eam_third_maintenance_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id
        ${ew.customSqlSegment}