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

935090232@qq.com

2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java

@@ -42,6 +42,9 @@
    @ApiModelProperty(value = "快过期 1-是 2-否")
    private String isInvalid;

    @ApiModelProperty(value = " 使用情况余额")
    private Double balance;

    @ApiModelProperty(value = "项目状态 有效/无效")
    private String status;

@@ -125,14 +128,6 @@
        } else {
            return "2";
        }
    }

    public String getSource() {
        return source;
    }

    public void setSource(String source) {
        this.source = source;
    }

    public void setStatus(String status) {