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

wzy

2021-01-26 c42165204bda966c32f6c5e6cba7a978e08922e7

 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;
    }