From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 05 Apr 2021 22:48:14 +0800 Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算 --- zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 14 ++++++++++++++ 1 files changed, 14 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 cacf737..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 "待预约" : @@ -148,6 +159,9 @@ case "预约取消" : this.status = "8"; break; + case "待确认" : + this.status = "9"; + break; default: this.status = "0"; break; -- Gitblit v1.9.1