Merge branch 'score_shop' into api_score_meger

jyy

2021-09-03 b687aa0f371e12d4ec1813f18a4f889e8f825f67

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