From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java index 8f9cbbb..6fb3473 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; import java.util.Date; /** @@ -23,6 +24,12 @@ @ApiModelProperty(value = "商品名称") private String name; + @ApiModelProperty(value = "套餐来源,转让,购买") + private String source; + + @ApiModelProperty(value = "划扣金额") + private BigDecimal price; + @ApiModelProperty(value = "时长") private Integer timeLength; @@ -38,6 +45,9 @@ @ApiModelProperty(value = "快过期 1-是 2-否") private String isInvalid; + + @ApiModelProperty(value = " 使用情况余额") + private Double balance; @ApiModelProperty(value = "项目状态 有效/无效") private String status; @@ -127,4 +137,28 @@ public void setStatus(String status) { this.status = status; } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Double getBalance() { + return balance; + } + + public void setBalance(Double balance) { + this.balance = balance; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } } -- Gitblit v1.9.1