Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-07-29 aecf1e6808cd9eca68f5ec87340bd6c92f8c464c

 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) {