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

jiangyouyao

2022-04-06 143acd2312a766f39c75b82bce5a32412b863825

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