Merge branch 'dev_New' into pcdz

zss

9 天以前 41d35c56043108b66a14e7a2d2d13bedfc2508e0

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