From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java
index d20e4a2..beb6247 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java
+++ b/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;
     }

--
Gitblit v1.9.1