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

maven

3 天以前 7a792a188e75c25623b92901ccb08361d31ad4df

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

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

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

}