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

gongchunyi

2 天以前 c65009112d54e6851c9deb646d43bed6d602b99c

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

@@ -138,5 +138,23 @@
     */
    private Integer inspectState;

    private Long purchaseLedgerId;

    /**
     * 报工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;
}