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

liyong

2 天以前 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

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

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