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

yaowanxin

昨天 97f84227acd789843541382a9625fe81d279c443

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

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

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

}