Merge branch 'developer'

姜友瑶

2022-05-17 81507d0c196821cd333f08c75f3978e726df24cd

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