Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

 zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java

@@ -19,7 +19,7 @@
    @ApiModelProperty(value = "查询参数")
    private String queryKey;

    @ApiModelProperty(value = "类型 0-全部 1-有效 2-无效 3-一个月内过期")
    @ApiModelProperty(value = "类型 0-全部 1-有效 3-无效 2-一个月内过期")
    private String type;

    public Long getVipId() {