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

yuan

2026-04-24 b4a9e12e00b78e1aef8acda070434de9ffd0d66a

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

@@ -1,7 +1,7 @@
package com.ruoyi.stock.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;


@@ -23,4 +23,11 @@
    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

    @Schema(description = "顶部父产品id")
    private Long topParentProductId;

}