From c423224dbe37ea69c1a36c696f85490343e68c4c Mon Sep 17 00:00:00 2001 From: 姜友瑶 <935090232@qq.com> Date: Tue, 09 Aug 2022 09:11:51 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 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 30c0cfa..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 @@ -25,6 +25,9 @@ @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 = "预约时间") @@ -42,6 +45,14 @@ @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