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

yaowanxin

2 天以前 4b189df3b30fa59dca58c5c7e7b5599a692a807a

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

@@ -144,6 +144,7 @@
     * 报工id
     */
    private Long productMainId;

    //不合格现象
    private String defectivePhenomena;

}