Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

昨天 290e5fd2e74efe19326f56e38c3391aaae23ffc5

 src/main/resources/mapper/OrderPakinMapper.xml

@@ -61,6 +61,7 @@
        where 1=1
        and settle = 4
        and status = 1
        and doc_type != 7
        order by create_time asc
    </select>