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

maven

12 小时以前 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3

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