Merge branch 'score_shop' into api_score_meger

Helius

2021-12-30 a282114c4ef2ae2d93df39bad14889b896fbdf80

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