Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

12 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

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

@@ -135,4 +135,9 @@

    @ApiModelProperty("关联检测id")
    private Long inspectId;


    @ApiModelProperty("是否不合格处理自己新增")
    @TableField(exist = false)
    private Boolean method;
}