Merge remote-tracking branch 'origin/master'

zss

2023-07-20 65fd581bef13be2380e481cc341b81c58a061a4a

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

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

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


}