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

zss

8 天以前 5a6ac2ffb3815f1ef510144dd6e88c64ee96f973

 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;

}