Merge branch 'dev_New' into pcdz

zss

9 天以前 41d35c56043108b66a14e7a2d2d13bedfc2508e0

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

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

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

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


    @TableField(exist = false)
    private String workOrderNo;
    @TableField(exist = false)
    private String purchaseContractNo;
}