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

jyy

2021-01-15 1bb16954b0630bd078483c06b26e835918ab7946

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

@@ -148,6 +148,9 @@
            case "预约取消" :
                this.status = "8";
                break;
            case "待确认" :
                this.status = "9";
                break;
            default:
                this.status = "0";
                break;