Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

17 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

@@ -37,4 +37,9 @@
    private BigDecimal totalStockIn;
    private BigDecimal totalStockOut;
    private BigDecimal currentStock;

    private BigDecimal  unLockedQuantity;

    //产品id
    private Long productId;
}