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

gongchunyi

3 天以前 c65009112d54e6851c9deb646d43bed6d602b99c

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -37,4 +37,6 @@
    private BigDecimal totalStockIn;
    private BigDecimal totalStockOut;
    private BigDecimal currentStock;

    private BigDecimal  unLockedQuantity;
}