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

buhuazhen

7 天以前 2aa05de6d43f32820bc6fd21df4bd0202ecae85f

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

@@ -63,6 +63,7 @@
        SELECT sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) as shipped_quantity
        FROM shipping_info si
        LEFT JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
        where si.status != '审核拒绝'
        GROUP BY sales_ledger_product_id
        ) t3 ON t3.sales_ledger_product_id = T1.id
        left join product_model pm ON T1.product_model_id = pm.id