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

buhuazhen

2026-03-06 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

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