Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-28 c5138faa1c4771bfbc19de5b257e7c129c081cb8

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java

@@ -37,6 +37,10 @@
    @JsonSerialize
    private String conclusion;

    @ApiModelProperty(value = "检验类型")
    @JsonSerialize
    private int type;

    @ApiModelProperty(value = "审批状态 0：待提交 1：待审核；2：已通过 3:不通过")
    @JsonSerialize
    private Integer status;