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

liyong

7 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

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

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

    private Long purchaseLedgerId;

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

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

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

}