From a8b6c114857a4fdc49b373967475b24caa11ee75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 20 十月 2022 19:01:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java | 16 ++++++++++++----
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java | 2 ++
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java
index ac73be5..fbc74fe 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java
@@ -9,6 +9,8 @@
public class EmployeeSchedule {
+ private String id;
+
private String shopId;
private String shopName;
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 0788277..e08169e 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
@@ -28,10 +28,7 @@
private String shopId;
/*闂ㄥ簵鍚嶇О*/
private String shopName;
- /*缇庡甯圛d*/
- private String beauticianId;
- /*缇庡甯堝悕绉�*/
- private String beauticianName;
+
/*鏉ユ簮鏍囪瘑锛堣鍗曟爣璇�*/
private String commonId;
/*鍟嗗搧绫诲瀷*/
@@ -54,6 +51,17 @@
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;
+
//棰勭害椤圭洰
List<PreOrderItemDto> preOrderItems;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
index fa6adad..c794249 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
@@ -30,6 +30,9 @@
private String orderId;
/**鐘舵��*/
private Integer status;
+ //鏄惁SPA(0:鍚�,1:鏄�)
+ private Integer isSpa;
+
//鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)
private String userProjectItemId;
--
Gitblit v1.8.0