Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

whycq

2024-06-23 69d68078402cd2029336a9e25fd78e4501bf2a80

 src/main/resources/mapper/OrderMapper.xml

@@ -65,6 +65,7 @@
        where 1=1
        and settle = 4
        and status = 1
        and doc_type not in(18,19)
        order by create_time asc
    </select>