Merge remote-tracking branch 'origin/master'

Houjie

9 天以前 b441d4a71dd43bf7fb12bfa62938ccd3020878b5

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

@@ -56,4 +56,11 @@
        group by t.repairer
        order by repairNumber desc
    </select>
    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamRepairOrder">
        select wmo.*, e.equipment_code, e.equipment_name, e.installation_position
        from eam_repair_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>
</mapper>