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

jyy

2021-06-23 918bfb7afa967b575a57f5880d492534c6e7de4f

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