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

935090232@qq.com

2021-10-30 cc59bd70ca7a57330801617b910c029a07fa2b4f

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