Merge remote-tracking branch 'origin/master'

jiang

2024-01-12 c9a5c5c9a57abee05470e958e4dc161809f73cf4

 jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java

@@ -78,6 +78,8 @@
    @Excel(name = "厂商")
    private String supplier;

    @Excel(name = "特需代码")
    private String mark;
    public void setId(Long id) 
    {
        this.id = id;
@@ -223,6 +225,16 @@
        return supplier;
    }

    public void setMark(String mark)
    {
        this.mark = mark;
    }

    public String getMark()
    {
        return mark;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -244,6 +256,7 @@
            .append("version", getVersion())
            .append("status", getStatus())
            .append("supplier", getSupplier())
            .append("mark", getMark())
            .toString();
    }
}