Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

10 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

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

@@ -144,7 +144,20 @@
     * 报工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;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}