Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

昨天 c924d59a94fc17d570610cbf2b691481dd0b2e4d

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

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

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