From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
index 718b238..bb68d68 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -4,10 +4,8 @@
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
+import java.util.List;
/**
* 鐢ㄦ埛鐧诲綍鍙傛暟
@@ -20,6 +18,7 @@
private String username;
@ApiModelProperty(value = "鎵嬫満鍙风爜")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "鎵嬫満鍙锋牸寮忔湁璇�")
private String mobile;
@NotEmpty
@@ -38,18 +37,29 @@
private String note;
@ApiModelProperty(value = "鏄惁鍏氬憳,0:鍚︼紝1锛氭槸",example = "0")
+ @NotNull(message = "鍏氬憳鏈�夋嫨")
private byte isDy;
+
+ @ApiModelProperty(value = "鎬у埆,0:濂筹紝1锛氱敺",example = "0")
+ @NotNull(message = "鎬у埆鏈�夋嫨")
+ private byte sex;
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
@ApiModelProperty(value = "閮ㄩ棬id")
- @NotNull(message = "閮ㄩ棬涓嶈兘涓虹┖")
private Long departmentId;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
+ @NotEmpty
+ @ApiModelProperty(value = "瑙掕壊Id鍒楄〃", required = true)
+ private List<Long> roleIds;
+
+// @ApiModelProperty(value = "鏄惁鏄礋璐ｄ汉锛�0->false,1->true锛岄粯璁�0",example = "0")
+// @NotNull(message = "璐熻矗浜烘湭閫夋嫨")
+// private byte isManager;
}
--
Gitblit v1.8.0