Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-25 f04c1a5a967679b9984926af72be8a3d3f26c2bb

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

@@ -27,7 +27,7 @@

    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "id", hidden = true)
    private int id;
    private Integer id;

    @ApiModelProperty(value = "materialId")
    private String materialId;