From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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..640799b 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
@@ -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) {
--
Gitblit v1.9.1