Merge remote-tracking branch 'origin/master'

李林

2023-07-20 5322edbcc5529864aaea26d78289df7a8a36fb77

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

@@ -74,7 +74,7 @@
    private Integer version;

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

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