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

liyong

17 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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