From aaaf4564b44adf5b9a47843b27fbd68ea56c9a52 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 08 Mar 2021 13:57:56 +0800 Subject: [PATCH] Merge branch 'api' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java index bf7e1ae..59561f0 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java @@ -34,6 +34,9 @@ @ApiModelProperty(value = "会员名称") private String vipName; + @ApiModelProperty(value = "门店名称") + private String shopName; + @ApiModelProperty(value = "服务时长") private Integer timeLength; @@ -122,6 +125,14 @@ return status; } + public String getShopName() { + return shopName; + } + + public void setShopName(String shopName) { + this.shopName = shopName; + } + public void setStatus(String status) { switch (status) { case "待预约" : -- Gitblit v1.9.1