From 1adb62f9f3e71b17430edead1af2ce65f950b249 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 25 十一月 2022 16:04:08 +0800
Subject: [PATCH] 卡口管理
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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..dff07d7 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
@@ -1,15 +1,17 @@
package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -22,14 +24,18 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_admin")
-@ApiModel(value="UmsAdmin瀵硅薄", description="鍚庡彴鐢ㄦ埛琛�")
+@ApiModel(value = "UmsAdmin瀵硅薄", description = "鍚庡彴鐢ㄦ埛琛�")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
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;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
private String username;
private String password;
@@ -40,7 +46,7 @@
@ApiModelProperty(value = "閭")
private String email;
- @ApiModelProperty(value = "鏄电О")
+ @ApiModelProperty(value = "鐪熷疄濮撳悕")
private String nickName;
@ApiModelProperty(value = "澶囨敞淇℃伅")
@@ -55,5 +61,47 @@
@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 Byte sex;
+
+ @ApiModelProperty(value = "鑱屽姟")
+ private String jobTitle;
+
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String departName;
+
+
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
+ private Integer userType;
+
+ @ApiModelProperty(value = "搴ф満/鍒嗘満")
+ private String zj;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ private String mobile;
+
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ private Integer isGrid;
+
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
+ @TableField(exist = false)
+ private String keyword;
+ @ApiModelProperty(value = "閮ㄩ棬")
+ @TableField(exist = false)
+ private List<UmsDepart> depart;
+ @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @TableField(exist = false)
+ private List<UmsRole> roles;
}
--
Gitblit v1.8.0