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

liyong

4 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

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

@@ -145,5 +145,11 @@
     */
    private Long productMainId;

    private Long productModelId;
    //不合格现象
    private String defectivePhenomena;

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

}