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

li-guang

2021-04-07 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6

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