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

maven

11 小时以前 43a8301f04a6ea7891ef16861734163b2646e07f

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

@@ -11,7 +11,7 @@
        t3.shipping_date
        FROM
        sales_ledger_product T1
        left join shipping_info t3 on T1.id = t3.sales_ledger_id
        left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
        <where>
            1=1
            <if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">