From ea249c33fdb89e90178da214133e01ea928e86a8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 11:30:24 +0800
Subject: [PATCH] update 包重命名 规范化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 31 +++++--------------------------
1 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 0adef26..7709981 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,13 +1,8 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -37,14 +32,12 @@
/**
* 鐢ㄦ埛ID
*/
- @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
@TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/**
* 閮ㄩ棬ID
*/
- @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
private Long deptId;
/**
@@ -52,14 +45,12 @@
*/
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- @Excel(name = "鐧诲綍鍚嶇О")
private String userName;
/**
* 鐢ㄦ埛鏄电О
*/
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- @Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
/**
@@ -67,19 +58,16 @@
*/
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- @Excel(name = "鐢ㄦ埛閭")
private String email;
/**
* 鎵嬫満鍙风爜
*/
- @Excel(name = "鎵嬫満鍙风爜")
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆
*/
- @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
private String sex;
/**
@@ -90,6 +78,11 @@
/**
* 瀵嗙爜
*/
+ @TableField(
+ insertStrategy = FieldStrategy.NOT_EMPTY,
+ updateStrategy = FieldStrategy.NOT_EMPTY,
+ whereStrategy = FieldStrategy.NOT_EMPTY
+ )
private String password;
@JsonIgnore
@@ -99,14 +92,8 @@
}
/**
- * 鐩愬姞瀵�
- */
- private String salt;
-
- /**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
/**
@@ -118,13 +105,11 @@
/**
* 鏈�鍚庣櫥褰旾P
*/
- @Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
private String loginIp;
/**
* 鏈�鍚庣櫥褰曟椂闂�
*/
- @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/**
@@ -137,7 +122,6 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -150,7 +134,6 @@
* 鏇存柊鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -167,10 +150,6 @@
/**
* 閮ㄩ棬瀵硅薄
*/
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
@TableField(exist = false)
private SysDept dept;
--
Gitblit v1.9.3