From 039a33d1bfa6ef041161666bbd120c34086fe7c1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 十月 2024 14:09:25 +0800
Subject: [PATCH] 课程代码
---
xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 91f946e..7226439 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,7 @@
package com.xinquan.system.api.domain;
import com.baomidou.mybatisplus.annotation.TableField;
+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;
@@ -13,6 +14,8 @@
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,6 +25,7 @@
*
* @author ruoyi
*/
+@Data
public class SysUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -32,12 +36,12 @@
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;
@@ -108,6 +112,7 @@
/** 角色ID */
@TableField(exist = false)
+ @ApiModelProperty(value = "角色ids 逗号拼接")
private Long roleId;
@ApiModelProperty(value = "备注")
@@ -115,6 +120,12 @@
@ApiModelProperty(value = "用户类型 00:管理后台用户 01:APP用户")
private String userType;
+ @ApiModelProperty(value = "禁用原因")
+ @TableField("reason")
+ private String reason;
+ @ApiModelProperty(value = "禁用时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime disableTime;
public String getUserType() {
return userType;
--
Gitblit v1.7.1