Merge remote-tracking branch 'origin/main'

baoshiwei

2025-04-17 bb79260cbeeac88cfbadc9606eea57002e8945bc

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsSpareInoutVo.java

@@ -11,11 +11,12 @@
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.eims.domain.bo.EimsSpareBo;

import java.io.Serial;
import java.io.Serializable;
import java.util.Date;

import java.util.List;


/**
@@ -87,5 +88,6 @@
    @ExcelProperty(value = "备注")
    private String remark;


    //出入库选择的备件明细
    private List<EimsSpareVo> spareList;
}