From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java |   14 +++++++++++++-
 1 files changed, 13 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 dadc947..30c0cfa 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
@@ -5,6 +5,7 @@
 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;
@@ -20,7 +21,7 @@
     @ApiModelProperty(value = "会员ID")
     private Long vipId;
 
-    @NotNull(message = "请选择美疗师")
+//    @NotNull(message = "请选择美疗师")
     @ApiModelProperty(value = "美疗师ID")
     private Long beautyId;
 
@@ -38,6 +39,17 @@
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "资金密码")
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
     public Long getVipId() {
         return vipId;
     }

--
Gitblit v1.9.1