From 32c350b8aca021b84125f1334f7a183a2defcbfd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 08 三月 2023 14:13:17 +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 |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 bb68d68..ee93ad6 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -55,6 +55,13 @@
 
     @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;
@@ -62,4 +69,11 @@
 //    @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