From c81a5b4f6c18f01059a5012ce436f079a1ff840a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 04 三月 2023 13:31:21 +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 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 1ebf317..ee93ad6 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -56,11 +56,24 @@
     @ApiModelProperty(value = "搴ф満/鍒嗘満")
     private String zj;
 
-    @NotBlank(message = "瑙掕壊Id鍒楄〃涓嶈兘涓虹┖")
+    @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;
 }

--
Gitblit v1.8.0