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

liyong

15 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 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 != '' ">