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

zss

2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe

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

@@ -133,5 +133,20 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    /**
     * 类别(0:未提交;1:已提交)
     */
    private Integer inspectState;

    private Long purchaseLedgerId;

    /**
     * 报工id
     */
    private Long productMainId;

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

}