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

gongchunyi

7 天以前 61fef835f616f70ca35e1f046cdda82d6b68bfdc

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

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

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

}