From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516 逻辑删除，更新字段IS_Delete字段为已删除，默认为空，删除后其余信息从查询中过滤了
---
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
index a07855f..6a9b593 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
@@ -1,8 +1,11 @@
package com.matrix.system.app.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@@ -18,19 +21,45 @@
@ApiModelProperty(value = "会员ID")
private Long vipId;
- @NotNull(message = "请选择美疗师")
+// @NotNull(message = "请选择美疗师")
@ApiModelProperty(value = "美疗师ID")
private Long beautyId;
+ @ApiModelProperty(value = "床位ID")
+ private Long bedId;
+
@NotNull(message = "请选择预约时间")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "预约时间")
private Date yyTime;
@ApiModelProperty(value = "选择的项目")
private List<CreateServiceOrderItemDto> projItems;
+ @ApiModelProperty(value = "总时长")
+ private Integer totalTime;
+
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "资金密码")
+ private String password;
+
+ public Long getBedId() {
+ return bedId;
+ }
+
+ public void setBedId(Long bedId) {
+ this.bedId = bedId;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
public Long getVipId() {
return vipId;
@@ -71,4 +100,12 @@
public void setRemark(String remark) {
this.remark = remark;
}
+
+ public Integer getTotalTime() {
+ return totalTime;
+ }
+
+ public void setTotalTime(Integer totalTime) {
+ this.totalTime = totalTime;
+ }
}
--
Gitblit v1.9.1