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

zss

5 天以前 aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac

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

@@ -21,10 +21,11 @@
        sum(tr.invoice_amount)as receipt_payment_amount,
        pl.contract_amount-sum(tr.invoice_amount) AS unReceipt_payment_amount,
        pl.entry_date,
        pl.execution_date,
        pl.recorder_id,
        pl.recorder_name,
        pl.template_name,
        pl.approver_id,
        pl.approve_user_ids,
        sm.is_white,
        pl.approval_status,
        pl.payment_method