Merge branch 'score_shop' into alpha

Helius

2021-11-02 4ae7f7f4de4f034c7a772975d7c457391e28b0b8

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