From b2a5e4be739b232876b87e65ed70fa5186943d1e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:29:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
index a5cf22d..f5d913e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
@@ -4,8 +4,6 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -25,13 +23,9 @@
public class AddFmsServiceAdminDTO {
@ApiModelProperty("服务用户")
- @NotBlank
- @Size(min = 1, max = 10)
private String userName;
@ApiModelProperty("联系电话")
- @NotBlank(message = "联系电话不能为空")
- @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
private String phone;
@ApiModelProperty("服务时间")
@@ -53,6 +47,9 @@
@ApiModelProperty("服务过程图片，多张逗号隔开")
private String processImage;
+ @ApiModelProperty("分派服务人员id")
+ private Long memberId;
+
@ApiModelProperty(value = "所属社区", hidden = true)
private Long communityId;
--
Gitblit v1.7.1