Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

7 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

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

@@ -144,7 +144,17 @@
     * 报工id
     */
    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;
}