Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-17 1739422c2ab97afea38b08d4bd5468093e264ca2

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