From 9dfaf53ea5e70c839a157fd6cc0abfc0da804fb1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 16:32:28 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index dd76b14..59cc0f2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -43,6 +43,8 @@
     /**
      * 订单划扣时间
      */
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date consumeTime;
 
     /**
@@ -62,15 +64,29 @@
      * 床位
      */
     private Long bedId;
-    /**
-     * 床位
-     */
+
     private Long companyId;
 
     /**
      * 主美疗师
      */
     private Long beauticianId;
+
+    /**
+     * 员工编号(美容顾问) 下单人id
+     */
+    private Long staffId;
+    /**
+     * 收银员姓名
+     */
+    @Extend
+    private String cashierName;
+
+
+    /**
+     * 收银员
+     */
+    private Long cashierId;
 
     /**
      * 仪器
@@ -251,6 +267,10 @@
     private Integer totalTime;
 
 
+    /**
+     * 到时提醒次数
+     */
+    private Integer overtimeNotice;
 
 
 
@@ -332,6 +352,49 @@
     @Extend
     private String pageFlae;
 
+    @Extend
+    private String queryKey;
+
+    public String getQueryKey() {
+        return queryKey;
+    }
+
+    public void setQueryKey(String queryKey) {
+        this.queryKey = queryKey;
+    }
+
+    public Long getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(Long staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getCashierName() {
+        return cashierName;
+    }
+
+    public void setCashierName(String cashierName) {
+        this.cashierName = cashierName;
+    }
+
+    public Long getCashierId() {
+        return cashierId;
+    }
+
+    public void setCashierId(Long cashierId) {
+        this.cashierId = cashierId;
+    }
+
+    public Integer getOvertimeNotice() {
+        return overtimeNotice;
+    }
+
+    public void setOvertimeNotice(Integer overtimeNotice) {
+        this.overtimeNotice = overtimeNotice;
+    }
+
     public String getPageFlae() {
         return pageFlae;
     }

--
Gitblit v1.9.1