From 143acd2312a766f39c75b82bce5a32412b863825 Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop
---
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 d569cea..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
@@ -21,9 +21,12 @@
@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")
@@ -39,10 +42,17 @@
@ApiModelProperty(value = "备注")
private String remark;
- @NotBlank(message = "参数错误")
@ApiModelProperty(value = "资金密码")
private String password;
+ public Long getBedId() {
+ return bedId;
+ }
+
+ public void setBedId(Long bedId) {
+ this.bedId = bedId;
+ }
+
public String getPassword() {
return password;
}
--
Gitblit v1.9.1