Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-09-14 c6bc9682699d3e10dc06a3d6641a70179e64f9a1

 src/main/resources/mapper/WaitMatchkMapper.xml

@@ -25,4 +25,10 @@

    </resultMap>

    <select id="selectWaitMatchkBySts" resultMap="BaseResultMap">
       select * from ints_wait_matchk
        where io_status=2 and verify_status=1
        order by modi_time,mat_no asc
    </select>

</mapper>