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

zss

昨天 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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

@@ -145,5 +145,8 @@
     */
    private Long productMainId;

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

}