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

yaowanxin

昨天 2be90eb75452c8f0820d89cb1cd018dd86a351e0

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

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

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