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

maven

3 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

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

@@ -126,6 +126,7 @@
        t3.purchase_contract_number,
        t2.product_category,
        t1.id,
        GROUP_CONCAT(t1.id) as ids,
        t1.sales_ledger_product_id,
        t1.create_user,
        t2.specification_model,
@@ -288,6 +289,7 @@
        t3.customer_name,
        t2.product_category,
        t1.id,
        group_concat(t1.id) as ids,
        t1.sales_ledger_product_id,
        t1.create_user,
        t2.specification_model,