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

maven

9 小时以前 63328dd80adc6331db581dda6418308e6fd4da12

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

@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    @ApiModelProperty("标准编号")
    private String standardNo;
@@ -62,7 +62,6 @@
    private Long tenantId;

    @ApiModelProperty("状态")
    @TableLogic
    private String state;

    @ApiModelProperty("类别(0:原材料检验;1:过程检验;2:出厂检验)")