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

liyong

2 天以前 a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -31,7 +31,7 @@
                 left join production_product_main ppm on qi.product_main_id = ppm.id
                 left join product_work_order pwo on ppm.work_order_id = pwo.id
                 left join product_order po on pwo.product_order_id = po.id
                 left join sales_ledger_product slp on po.product_model_id = slp.id
                 left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
        where qi.product_main_id = #{productMainId}