From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 27 十月 2023 16:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
index de435b2..53f5b25 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
@@ -3,7 +3,6 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
-import java.util.Date;
import java.util.List;
/**
@@ -22,17 +21,14 @@
/*鐢ㄦ埛鍚嶇О*/
private String userName;
/*棰勭害寮�濮嬫椂闂�*/
- private Date startTime;
+ private String startTime;
/*棰勭害缁撴潫鏃堕棿*/
- private Date endTime;
+ private String endTime;
/*闂ㄥ簵Id*/
private String shopId;
/*闂ㄥ簵鍚嶇О*/
private String shopName;
- /*缇庡甯圛d*/
- private String beauticianId;
- /*缇庡甯堝悕绉�*/
- private String beauticianName;
+
/*鏉ユ簮鏍囪瘑锛堣鍗曟爣璇�*/
private String commonId;
/*鍟嗗搧绫诲瀷*/
@@ -51,6 +47,25 @@
private String platSourceName;
/*鏄惁SPA(0:鍚�,1:鏄�)*/
private Integer isSpa;
+ /*澶囨敞*/
+ private String remarks;
+ /*鐘舵�� 0锛氬緟鍒板簵锛�1锛氬彇娑堥绾︼紱2锛氬凡鍒板簵锛�3锛氶绾﹀畬鎴�*/
+ private Integer status;
+ /*宸ヤ綔浜哄憳鎺掔彮id*/
+ private String employeeScheduleId;
+ /*宸ヤ綔浜哄憳鎺掔彮瀛愰」id*/
+ private String employeeScheduleItemId;
+ /*棰勭害鏃堕暱,浠ュ垎閽熶负瀛樺偍鍗曚綅*/
+ private Integer useDuration;
+ /*鍛樺伐鍚嶇О*/
+ private String employeeName;
+ /*鍛樺伐id*/
+ private String employeeId;
+ /*涓嬪崟鎿嶄綔浜烘爣璇嗭紙Employee锛�*/
+ private String operatorId;
+ private String operatorName;
+
+
//棰勭害椤圭洰
List<PreOrderItemDto> preOrderItems;
--
Gitblit v1.8.0