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

gongchunyi

9 天以前 f9c24cdd04de07001f078ea093b724e647ac35b2

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

@@ -149,4 +149,12 @@
    //不合格现象
    private String defectivePhenomena;

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


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