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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 d0fd4d8..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;
/**
@@ -22,6 +23,12 @@
@ApiModelProperty(value = "商品名称")
private String name;
+
+ @ApiModelProperty(value = "套餐来源，转让，购买")
+ private String source;
+
+ @ApiModelProperty(value = "划扣金额")
+ private BigDecimal price;
@ApiModelProperty(value = "时长")
private Integer timeLength;
@@ -127,6 +134,18 @@
}
}
+ 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;
}
@@ -135,7 +154,11 @@
this.balance = balance;
}
- public void setStatus(String status) {
- this.status = status;
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ public void setPrice(BigDecimal price) {
+ this.price = price;
}
}
--
Gitblit v1.9.1