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

liyong

4 天以前 2cc19f8033348f34df382d27f63810b2d6f56a05

 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;

}