From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Fri, 09 Jul 2021 20:50:16 +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 | 6 +++++- 1 files changed, 5 insertions(+), 1 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 4854fa2..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 @@ -117,7 +117,11 @@ } public String getStatus() { - return status; + if ("有效".equals(status)) { + return "1"; + } else { + return "2"; + } } public void setStatus(String status) { -- Gitblit v1.9.1