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

zss

6 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -6,6 +6,7 @@
        select
        t3.supplier_name,
        t2.product_category,
        t3.purchase_contract_number,
        t1.id,
        t1.code,
        t2.specification_model,