From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/UserLogin.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/UserLogin.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/UserLogin.java
index a24e3f9..1508625 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/UserLogin.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/UserLogin.java
@@ -1,8 +1,10 @@
package com.vincent.rsf.server.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.TenantService;
@@ -17,7 +19,7 @@
@Data
@TableName("sys_user_login")
-public class UserLogin implements Serializable {
+public class UserLogin implements Serializable {
public static final int TYPE_LOGIN = 0; // 鐧诲綍鎴愬姛
public static final int TYPE_ERROR = 1; // 鐧诲綍澶辫触
@@ -69,11 +71,13 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
* 鐧诲綍绯荤粺
*/
+ @TableField("`system`")
@ApiModelProperty(value= "鐧诲綍绯荤粺")
private String system;
--
Gitblit v1.9.1