Merge branch 'jtwy' into dev_New

zss

23 小时以前 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

 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;

}