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

yaowanxin

昨天 17a7110753d9efeeaca28d7869fec4d084fc2d46

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

@@ -138,5 +138,15 @@
     */
    private Integer inspectState;

    private Long purchaseLedgerId;

    /**
     * 报工id
     */
    private Long productMainId;

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

}