From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java |   17 ++++++++++++++++-
 1 files changed, 16 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 b8431ac..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
@@ -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,11 +21,12 @@
     @ApiModelProperty(value = "会员ID")
     private Long vipId;
 
-    @NotNull(message = "请选择美疗师")
+//    @NotNull(message = "请选择美疗师")
     @ApiModelProperty(value = "美疗师ID")
     private Long beautyId;
 
     @NotNull(message = "请选择预约时间")
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
     @ApiModelProperty(value = "预约时间")
     private Date yyTime;
 
@@ -35,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