@@ -767,6 +767,5 @@
WHERE
AIR.REQUIREMENT_STATUS = 2
AND AIR.DELETED = 0
->>>>>>> 2575cdbb9e23d44b2db153432ead44f438969766
</select>
</mapper>
