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

@@ -23,6 +23,9 @@
    @ApiModelProperty(value = "商品名称")
    private String name;

    @ApiModelProperty(value = "套餐来源，转让，购买")
    private String source;

    @ApiModelProperty(value = "时长")
    private Integer timeLength;

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

    public Double getBalance() {
        return balance;
    }

    public void setBalance(Double balance) {
        this.balance = balance;
    }

    public void setStatus(String status) {