From 8439887c903fa52560af52b40e12a1baa8a123d3 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 05 七月 2023 10:27:43 +0800
Subject: [PATCH] 代码合并
---
ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 c1931de..a386288 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -5,6 +5,7 @@
import lombok.Setter;
import javax.validation.constraints.*;
+import java.util.List;
/**
* 鐢ㄦ埛鐧诲綍鍙傛暟
@@ -12,6 +13,8 @@
@Getter
@Setter
public class UmsAdminParam {
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�", required = false)
+ private Long id;
@NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
@ApiModelProperty(value = "鐢ㄦ埛鍚�", required = true)
private String username;
@@ -35,9 +38,13 @@
@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;
@@ -46,12 +53,32 @@
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 = "鏄惁鏄礋璐ｄ汉锛�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