Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-25 f04c1a5a967679b9984926af72be8a3d3f26c2bb

 standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java

@@ -10,6 +10,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -68,6 +69,5 @@

    @ApiModelProperty(value = "关联 规格id", example = "1", required = true)
    private Integer specificationsId;


}