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

zss

2 天以前 aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac

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

@@ -144,7 +144,12 @@
     * 报工id
     */
    private Long productMainId;

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

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

}