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

yaowanxin

8 天以前 d4b9db2b8958355b9960d57088af9865bb2b2f0d

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

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

    //采购台账产品id
    private Long purchaseLedgerId;

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

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

}