Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-25 f04c1a5a967679b9984926af72be8a3d3f26c2bb

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

@@ -79,5 +79,6 @@
    @ApiModelProperty(value = "关联 用户id 试验员")
    private Integer userId;


    @ApiModelProperty(value = "关联 设备id")
    private Integer instrument_id;
}