Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

8 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

 src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java

@@ -64,7 +64,7 @@
    @ApiModelProperty("状态")
    private String state;

    @ApiModelProperty("类别(0:原材料检验;1:过程检验;2:出厂检验)")
    @ApiModelProperty("类别(0:原材料检验;1:过程检验;2:成品检验)")
    private Integer inspectType;

    @ApiModelProperty("工序id")