Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

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

@@ -75,12 +75,12 @@

    private Integer version;

    @ApiModelProperty(value = "关联 报检id")
    @ApiModelProperty(value = "关联 报检物料id")
    private int inspectionMaterialListId;

    @ApiModelProperty(value = "关联 用户id 试验员")
    private Integer userId;

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