From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +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 | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 13decc4..8f9cbbb 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
@@ -39,6 +39,9 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+ @ApiModelProperty(value = "项目状态 有效/无效")
+ private String status;
+
public String getIsInvalid() {
Date date = DateUtil.getDateAfterMonth(new Date(), 1);
if (invalidTime != null) {
@@ -112,4 +115,16 @@
public void setId(Long id) {
this.id = id;
}
+
+ public String getStatus() {
+ if ("有效".equals(status)) {
+ return "1";
+ } else {
+ return "2";
+ }
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
}
--
Gitblit v1.9.1