From dce20bc3e1d912f75d977acafba98e1eaf19cc9a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 20 十月 2022 18:43:23 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 57d71a0..0788277 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,9 +21,9 @@
/*鐢ㄦ埛鍚嶇О*/
private String userName;
/*棰勭害寮�濮嬫椂闂�*/
- private Date startTime;
+ private String startTime;
/*棰勭害缁撴潫鏃堕棿*/
- private Date endTime;
+ private String endTime;
/*闂ㄥ簵Id*/
private String shopId;
/*闂ㄥ簵鍚嶇О*/
@@ -49,6 +48,12 @@
private String platSourceCode;
/*鏉ユ簮骞冲彴鍚嶇О*/
private String platSourceName;
+ /*鏄惁SPA(0:鍚�,1:鏄�)*/
+ private Integer isSpa;
+ /*澶囨敞*/
+ private String remarks;
+ /*鐘舵�� 0锛氬緟鍒板簵锛�1锛氬彇娑堥绾︼紱2锛氬凡鍒板簵锛�3锛氶绾﹀畬鎴�*/
+ private Integer status;
//棰勭害椤圭洰
List<PreOrderItemDto> preOrderItems;
--
Gitblit v1.8.0