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

zss

昨天 40946ba6c24a0318f14cbed603f0ed9cad1da853

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

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

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

}