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

zss

2 天以前 ee672b09c79e13e45ddc719f8780188fd196ac0a

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

@@ -140,5 +140,16 @@

    private Long purchaseLedgerId;

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

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

    @ApiModelProperty("关联检测标准主表id")
    private Long testStandardId;

}