fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

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