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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java

@@ -10,12 +10,25 @@
@ApiModel(value = "ServiceOrderListProjVo", description = "服务单列表项目返回参数类")
public class ServiceOrderListProjVo {

    @ApiModelProperty(value = "美疗师ID")
    private Long id;

    @ApiModelProperty(value = "项目名称")
    private String projName;

    @ApiModelProperty(value = "美疗师")
    private String beautyName;



    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getProjName() {
        return projName;
    }