Merge remote-tracking branch 'origin/master'

Houjie

8 天以前 b441d4a71dd43bf7fb12bfa62938ccd3020878b5

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

@@ -29,4 +29,11 @@
        and err.maintenance_date < #{end}
        group by FORMAT(err.maintenance_date, 'yyyy-MM')
    </select>
    <select id="selectUnReceivedMaintenanceOrder"
            resultType="org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder">
        select ewm.*,ee.org_id
        from eam_week_maintenance_order ewm
        left join eam_equipment ee on ewm.equipment_id = ee.id
        where ewm.maintenance_status = 'WAIT_MAINTENANCE' and ewm.del_flag = 0
    </select>
</mapper>