From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 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..a386288 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;
 
 /**
  * 鐢ㄦ埛鐧诲綍鍙傛暟
@@ -15,11 +13,14 @@
 @Getter
 @Setter
 public class UmsAdminParam {
+    @ApiModelProperty(value = "鐢ㄦ埛鍚�", required = false)
+    private Long id;
     @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
@@ -37,19 +38,47 @@
     @ApiModelProperty(value = "澶囨敞")
     private String note;
 
-    @ApiModelProperty(value = "鏄惁鍏氬憳,0:鍚︼紝1锛氭槸",example = "0")
+    @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;
+
+    @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+    private Integer isGrid;
+
+    @ApiModelProperty(value = "鐪熷疄濮撳悕")
+    private String nickName;
+
+    @NotEmpty
+    @ApiModelProperty(value = "瑙掕壊Id鍒楄〃", required = true)
+    private List<Long> roleIds;
+
+//    @ApiModelProperty(value = "鏄惁鏄礋璐d汉锛�0->false,1->true锛岄粯璁�0",example = "0")
+//    @NotNull(message = "璐熻矗浜烘湭閫夋嫨")
+//    private byte isManager;
+
+
+    @ApiModelProperty(value = "mac鍦板潃")
+    private String macAddress;
+
+    @ApiModelProperty(value = "ip鍦板潃")
+    private String ipAddress;
+
+    @ApiModelProperty(value = "鏈夋晥澶╂暟")
+    private Integer days;
 }

--
Gitblit v1.8.0