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

liyong

2 天以前 a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93

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