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

liyong

7 天以前 516a98353f103b44b87a36251cffaf5df8a8f7bc

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

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

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

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

}