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

liyong

22 小时以前 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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

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

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

}