From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 7a2eb52..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,8 +4,8 @@
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.*;
+import java.util.List;
/**
* 鐢ㄦ埛鐧诲綍鍙傛暟
@@ -13,19 +13,53 @@
@Getter
@Setter
public class UmsAdminParam {
- @NotEmpty
+ @NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
@ApiModelProperty(value = "鐢ㄦ埛鍚�", required = true)
private String username;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "鎵嬫満鍙锋牸寮忔湁璇�")
+ private String mobile;
+
@NotEmpty
@ApiModelProperty(value = "瀵嗙爜", required = true)
private String password;
+
@ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String icon;
+
@Email
@ApiModelProperty(value = "閭")
private String email;
- @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
- private String nickName;
+
+
@ApiModelProperty(value = "澶囨敞")
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")
+ private Long departmentId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
+ 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