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

maven

13 小时以前 43a8301f04a6ea7891ef16861734163b2646e07f

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

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

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