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

liyong

4 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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

@@ -59,7 +59,8 @@
        T1.execution_date,
        T2.nick_name AS entry_person_name,
        T1.payment_method,
        t3.shipping_car_number
        t3.shipping_car_number,
        t3.shipping_date
        FROM
        sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id