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

liyong

2026-05-22 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

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

@@ -3,6 +3,8 @@
import com.ruoyi.stock.pojo.StockUninventory;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class StockUninventoryDto  extends StockUninventory {
    private String productName;
@@ -15,4 +17,6 @@

    //入库类型对应的id
    private Long recordId;

    private BigDecimal unLockedQuantity;
}