Merge remote-tracking branch 'refs/remotes/origin/dev_New' into jtwy

liyong

2026-02-04 69bb4a6479653f2e27cb67ce0ab817bd40e9c791

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