Merge branch 'jtwy' into dev_New

zss

19 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

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

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

    private Long purchaseLedgerId;

    /**
     * 报工id
     */
    private Long productMainId;
    //不合格现象
    private String defectivePhenomena;

}