Merge branch 'ty_fix' into alpha

Helius

2021-11-09 1b282ec9813ce53576e45b68072c72e730fa8356

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