Merge branch 'jtwy' into dev_New

zss

昨天 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa

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

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

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