From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
index 3faf056..ba42311 100644
--- a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
+++ b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
@@ -1,6 +1,8 @@
package com.xinquan.system.api.domain;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinquan.common.core.annotation.Excel;
import com.xinquan.common.core.annotation.Excel.ColumnType;
import com.xinquan.common.core.annotation.Excel.Type;
@@ -8,11 +10,13 @@
import com.xinquan.common.core.web.domain.BaseEntity;
import com.xinquan.common.core.xss.Xss;
import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,30 +26,33 @@
*
* @author ruoyi
*/
+@Data
public class SysUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
- @TableField("user_id")
+ @TableId("user_id")
private Long userId;
/** 部门ID */
- @Excel(name = "部门编号", type = Type.IMPORT)
+ @Excel(name = "部门id", type = Type.IMPORT)
@TableField("dept_id")
private Long deptId;
/** 用户账号 */
- @Excel(name = "登录名称")
+ @Excel(name = "登录名称/登录账号")
@TableField("user_name")
private String userName;
/** 用户昵称 */
- @Excel(name = "用户名称")
- @NotBlank(message = "姓名不能为空")
+ @Excel(name = "用户名称(姓名)")
@TableField("nick_name")
private String nickName;
+ @Excel(name = "操作人")
+ @TableField("handleName")
+ private String handleName;
/** 用户邮箱 */
@Excel(name = "用户邮箱")
@@ -53,7 +60,6 @@
/** 手机号码 */
@Excel(name = "手机号码")
- @NotBlank(message = "请输入账号")
private String phonenumber;
/** 用户性别 */
@@ -64,7 +70,6 @@
private String avatar;
/** 密码 */
- @NotBlank(message = "密码不能为空")
private String password;
/** 帐号状态（0正常 1停用） */
@@ -84,7 +89,7 @@
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("login_date")
- private Date loginDate;
+ private LocalDateTime loginDate;
/** 部门对象 */
@Excels({
@@ -100,18 +105,40 @@
/** 角色组 */
@TableField(exist = false)
+ @ApiModelProperty(value = "角色id数组")
private Long[] roleIds;
/** 岗位组 */
@TableField(exist = false)
- private Long[] postIds;
+ @ApiModelProperty(value = "部门id数组")
+ private List<Long> deptIds;
/** 角色ID */
@TableField(exist = false)
private Long roleId;
+
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "用户类型 00:管理后台用户 01:APP用户")
+ @TableField("user_type")
+ private String userType;
+ @ApiModelProperty(value = "禁用原因")
+ @TableField("reason")
+ private String reason;
+ @ApiModelProperty(value = "禁用时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("disable_time")
+ private LocalDateTime disableTime;
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
@Override
public String getRemark() {
@@ -270,12 +297,12 @@
this.loginIp = loginIp;
}
- public Date getLoginDate()
+ public LocalDateTime getLoginDate()
{
return loginDate;
}
- public void setLoginDate(Date loginDate)
+ public void setLoginDate(LocalDateTime loginDate)
{
this.loginDate = loginDate;
}
@@ -310,15 +337,6 @@
this.roleIds = roleIds;
}
- public Long[] getPostIds()
- {
- return postIds;
- }
-
- public void setPostIds(Long[] postIds)
- {
- this.postIds = postIds;
- }
public Long getRoleId()
{
--
Gitblit v1.7.1