Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 8b2e015759d11561638bdc0ecae070557b387451

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