Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-19 e63f97c751edba11f85339e86c6cd578cbcd2c20

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

@@ -19,6 +19,8 @@
    @ApiModelProperty(value = "美疗师")
    private String beautyName;



    public Long getId() {
        return id;
    }