From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 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 11bca7e..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;
/**
* 仪器
@@ -336,6 +352,40 @@
@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;
--
Gitblit v1.9.1