From b60e601d62c0e2d5c4fd1df9f12fa09f2bf99987 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 十月 2024 17:56:48 +0800
Subject: [PATCH] 调试支付
---
xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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..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;
@@ -8,11 +9,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,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;
@@ -84,7 +88,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({
@@ -108,10 +112,28 @@
/** 角色ID */
@TableField(exist = false)
+ @ApiModelProperty(value = "角色ids 逗号拼接")
private Long roleId;
@ApiModelProperty(value = "备注")
private String remark;
+
+ @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;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
@Override
public String getRemark() {
@@ -270,12 +292,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;
}
--
Gitblit v1.7.1