Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

@@ -149,4 +149,7 @@
    //不合格现象
    private String defectivePhenomena;

    @ApiModelProperty("关联检测标准主表id")
    private Long testStandardId;

}