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

liyong

8 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

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