Merge branch 'developer' into alpha

姜友瑶

2022-05-04 9fc4177dd26683f5dc6d8ebb62ab5b230ac21def

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