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

liyong

10 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -62,7 +62,9 @@
        select si.qualitity,
        pm.model,
        pm.unit,
        p.product_name
        p.product_name,
        si.remark,
        si.update_time
        from stock_inventory si
        left join product_model pm on si.product_model_id = pm.id
        left join product p on pm.product_id = p.id