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

liyong

6 天以前 2cc19f8033348f34df382d27f63810b2d6f56a05

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

@@ -8,6 +8,11 @@
        s.sales_ledger_id,
        s.shipping_date,
        s.shipping_car_number,
        s.express_number,
        s.express_company,
        s.shipping_no,
        s.type,
        s.status,
        s.create_time,
        s.update_time,
        s.create_user,