diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java index d345fa96..974ad4d2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; import lombok.experimental.Accessors; +import org.ttzero.excel.annotation.ExcelColumn; + import java.time.LocalDateTime; import java.time.LocalDate; @@ -20,28 +22,23 @@ import java.time.LocalDate; @Accessors(chain = true) @ApiModel(value="com-nflg-product-bomnew-pojo-mate-vo-MaterialMateEntityVO") public class MaterialMateVO implements Serializable { - - /** - * 物料编码 - */ - @ApiModelProperty(value = "物料编码") + + private Long rowId; + //物料编码 + @ExcelColumn("物料编号") private String materialNo; - - /** - * 物料名称 - */ - @ApiModelProperty(value = "物料名称") + //物料名称 + @ExcelColumn("图纸名称包含") private String materialName; - - /** - * 材质 - */ - @ApiModelProperty(value = "材质") + //材质 + @ExcelColumn("图纸材质") private String materialTexture; - - @ApiModelProperty("物料描述") + //物料描述 + @ExcelColumn("物料描述") private String materialDesc; + + private Boolean checked = false;