From 9fe6d40d35068e62df4f69f9eed86ab1bc738b00 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 25 八月 2026 18:08:21 +0800
Subject: [PATCH] fix: 时区错误
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index ac7f535..a88c7fc 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -1,18 +1,22 @@
package com.ruoyi.project.system.domain;
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
import com.baomidou.mybatisplus.annotation.TableField;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import jakarta.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -60,12 +64,17 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
+ /** 鏄惁寮�閫欰I鍔熻兘锛�0鍚� 1鏄級 */
+ @JsonIgnore
+ private Integer aiEnabled;
+
/** 鏈�鍚庣櫥褰旾P */
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
private String loginIp;
/** 鏈�鍚庣櫥褰曟椂闂� */
@Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
@@ -121,6 +130,12 @@
*/
@TableField(exist = false)
private String deptNames;
+
+ /**
+ * 瑙掕壊鍚嶇О
+ */
+ @TableField(exist = false)
+ private String roleNames;
public Long getCurrentDeptId() {
return currentDeptId;
@@ -258,6 +273,16 @@
this.delFlag = delFlag;
}
+ public Integer getAiEnabled()
+ {
+ return aiEnabled;
+ }
+
+ public void setAiEnabled(Integer aiEnabled)
+ {
+ this.aiEnabled = aiEnabled;
+ }
+
public String getLoginIp()
{
return loginIp;
@@ -352,6 +377,14 @@
this.deptNames = deptNames;
}
+ public String getRoleNames() {
+ return roleNames;
+ }
+
+ public void setRoleNames(String roleNames) {
+ this.roleNames = roleNames;
+ }
+
public Long getDeptId() {
return deptId;
}
@@ -373,6 +406,7 @@
.append("password", getPassword())
.append("status", getStatus())
.append("delFlag", getDelFlag())
+ .append("aiEnabled", getAiEnabled())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("createBy", getCreateBy())
--
Gitblit v1.9.3