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

gongchunyi

5 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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

@@ -144,7 +144,17 @@
     * 报工id
     */
    private Long productMainId;

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

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


    @TableField(exist = false)
    private String workOrderNo;
    @TableField(exist = false)
    private String purchaseContractNo;
}