Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-15 7c4f93e72f2f0b4a9c5dd7c3ba35802357ec5e84

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java

@@ -140,7 +140,11 @@
    }

    public String getStatus() {
        return status;
        if ("有效".equals(status)) {
            return "1";
        } else {
            return "2";
        }
    }

    public void setStatus(String status) {