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

buhuazhen

5 天以前 706d0d62cc25829ec6948e2fd5d03e62acf29306

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

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

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

    @ApiModelProperty("参数项")
    private String parameterItem;