From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
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 39d6601..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;
/**
@@ -26,6 +27,9 @@
@ApiModelProperty(value = "套餐来源，转让，购买")
private String source;
+ @ApiModelProperty(value = "划扣金额")
+ private BigDecimal price;
+
@ApiModelProperty(value = "时长")
private Integer timeLength;
@@ -41,6 +45,9 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+
+ @ApiModelProperty(value = " 使用情况余额")
+ private Double balance;
@ApiModelProperty(value = "项目状态 有效/无效")
private String status;
@@ -127,6 +134,10 @@
}
}
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
public String getSource() {
return source;
}
@@ -135,7 +146,19 @@
this.source = source;
}
- public void setStatus(String status) {
- this.status = status;
+ 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