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

liyong

3 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

 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;
}