From c775c6953d9759e70f08acbfa8f6d7490aaae3d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 九月 2024 21:13:53 +0800
Subject: [PATCH] 1
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 0779678..9bc9146 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
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
+import org.joda.time.DateTime;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -33,6 +37,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
@ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
@@ -58,6 +63,10 @@
@ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
private Date loginTime;
+ @ApiModelProperty(value = "璐﹀彿鏈夋晥鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date expirationDate;
+
@ApiModelProperty(value = "甯愬彿鍚敤鐘舵�侊細0->绂佺敤锛�1->鍚敤")
private Integer status;
@@ -80,6 +89,7 @@
@TableField(exist = false)
private String departName;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
private Integer userType;
@@ -89,12 +99,30 @@
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+ @ApiModelProperty(value = "搴旂敤+鐢ㄦ埛鍞�旀爣璇�")
+ private String openid;
+
+ @ApiModelProperty(value = "閽夐拤璐︽埛id")
+ @TableField("account_id")
+ private Long accountId;
+
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
- @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ @TableField("password_error_num")
+ private Integer passwordErrorNum;
+
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ @TableField("password_error_last_time")
+ private LocalDateTime passwordErrorLastTime;
+
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
@TableField(exist = false)
- private UmsDepart depart;
+ 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