Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 dd571bf55de7f9a72d458adc179958ed2f9473c0

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java

@@ -41,6 +41,8 @@
    @ApiModelProperty(value = "仪器关联Id", example = "1", required = true)
    private Integer instrumentId;

    private Integer plan;

    @ApiModelProperty(value = "计量单位", example = "GB", required = true)
    private String measurementUnit;