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

liyong

2 天以前 2329f548c36876a59a7808e8c96466e94e088350

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

@@ -28,7 +28,8 @@
        pl.approve_user_ids,
        sm.is_white,
        pl.approval_status,
        pl.payment_method
        pl.payment_method,
        pl.remarks
        from purchase_ledger pl
        left join sales_ledger_product slp on slp.sales_ledger_id = pl.id and slp.type=2
        left join product_record pr on pl.id = pr.purchase_ledger_id