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/ServiceTcVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
index 256f635..fb43859 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -36,6 +37,9 @@
@ApiModelProperty(value = "若套餐为任选套餐 则判断是否无限次 Y是 N否")
private String isInfinite;
+
+ @ApiModelProperty(value = "来源")
+ private String source;
@ApiModelProperty(value = "套餐内产品")
List<ServiceProjVo> proj;
@@ -140,10 +144,22 @@
}
public String getStatus() {
- return status;
+ if ("有效".equals(status)) {
+ return "1";
+ } else {
+ return "2";
+ }
}
public void setStatus(String status) {
this.status = status;
}
+
+ public String getSource() {
+ return source;
+ }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
}
--
Gitblit v1.9.1