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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml

@@ -27,7 +27,7 @@
        sl.customer_name,
        sl.contract_amount
        ORDER BY
        sl.sales_contract_no;
        sl.sales_contract_no
    </select>
    <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
        select *