~jiangyouyao/beauty-erp.git

			@@ -18,6 +18,12 @@
			@ApiModelProperty(value = "服务单Id")
			private Long id;

			@ApiModelProperty(value = "会员ID")
			private Long vipId;

			@ApiModelProperty(value = "下单顾问ID")
			private Long createStaffId;

			@ApiModelProperty(value = "服务单编号")
			private String serviceNo;

			@@ -28,17 +34,36 @@
			@ApiModelProperty(value = "会员名称")
			private String vipName;

			@ApiModelProperty(value = "门店名称")
			private String shopName;

			@ApiModelProperty(value = "服务时长")
			private Integer timeLength;

			@ApiModelProperty(value = "床位")
			private String bed;

			@ApiModelProperty(value = "状态")
			@ApiModelProperty(value = "状态 1-待预约 2-待派单 3-待配料 4-待服务 5-服务中 6-服务完成 7-服务单结束")
			private String status;

			@ApiModelProperty(value = "服务项目信息")
			private List<ServiceOrderListProjVo> projs;

			public Long getVipId() {
			return vipId;
			}

			public void setVipId(Long vipId) {
			this.vipId = vipId;
			}

			public Long getCreateStaffId() {
			return createStaffId;
			}

			public void setCreateStaffId(Long createStaffId) {
			this.createStaffId = createStaffId;
			}

			public List<ServiceOrderListProjVo> getProjs() {
			return projs;
			@@ -100,7 +125,46 @@
			return status;
			}

			public String getShopName() {
			return shopName;
			}

			public void setShopName(String shopName) {
			this.shopName = shopName;
			}

			public void setStatus(String status) {
			this.status = status;
			switch (status) {
			case "待预约" :
			this.status = "1";
			break;
			case "预约成功待处理" :
			this.status = "2";
			break;
			case "需配料" :
			this.status = "3";
			break;
			case "配料完成" :
			this.status = "4";
			break;
			case "服务中" :
			this.status = "5";
			break;
			case "服务完成" :
			this.status = "6";
			break;
			case "服务单结束" :
			this.status = "7";
			break;
			case "预约取消" :
			this.status = "8";
			break;
			case "待确认" :
			this.status = "9";
			break;
			default:
			this.status = "0";
			break;
			}
			}
			}