From e09449ffcf303f67f5bbd168383b285600a251ec Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:25:48 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 1c61e6d..67df2c9 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
@@ -43,6 +43,9 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+ @ApiModelProperty(value = "状态 有效/无效")
+ private String status;
+
@ApiModelProperty(hidden = true)
private List<SysProjUse> taocanProjUse;
@@ -135,4 +138,16 @@
public void setProj(List<ServiceProjVo> proj) {
this.proj = proj;
}
+
+ public String getStatus() {
+ if ("有效".equals(status)) {
+ return "1";
+ } else {
+ return "2";
+ }
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
}
--
Gitblit v1.9.1