Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

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

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

    private String  unLockedQuantity;
    private BigDecimal  unLockedQuantity;

    private String rootName;
}