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

liyong

12 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

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

@@ -38,5 +38,5 @@
    private BigDecimal totalStockOut;
    private BigDecimal currentStock;

    private String  unLockedQuantity;
    private BigDecimal  unLockedQuantity;
}