From 12d0de05f9f570243382c32ba0ba6675e7d7931c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 07 九月 2022 15:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index 1494867..67edecf 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -22,10 +22,10 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_admin")
-@ApiModel(value="UmsAdmin瀵硅薄", description="鍚庡彴鐢ㄦ埛琛�")
+@ApiModel(value = "UmsAdmin瀵硅薄", description = "鍚庡彴鐢ㄦ埛琛�")
public class UmsAdmin implements Serializable {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "閭")
private String email;
- @ApiModelProperty(value = "鏄电О")
+ @ApiModelProperty(value = "鐢ㄦ埛鍚嶏紙绯荤粺榛樿鐢熸垚锛�")
private String nickName;
@ApiModelProperty(value = "澶囨敞淇℃伅")
@@ -55,5 +55,30 @@
@ApiModelProperty(value = "甯愬彿鍚敤鐘舵�侊細0->绂佺敤锛�1->鍚敤")
private Integer status;
+ @ApiModelProperty(value = "mac鍦板潃")
+ private String macAddress;
+ @ApiModelProperty(value = "ip鍦板潃")
+ private String ipAddress;
+
+ @ApiModelProperty(value = "鏄惁鍏氬憳")
+ private byte isDy;
+
+ @ApiModelProperty(value = "鑱屽姟")
+ private String jobTitle;
+
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ private Long departmentId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
+ private byte userType;
+
+ @ApiModelProperty(value = "搴ф満/鍒嗘満")
+ private String zj;
+
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ private String realName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ private String mobile;
}
--
Gitblit v1.8.0