From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
index 65f5e86..6c1c5f1 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -56,7 +56,7 @@
@ApiModelProperty(value = "会员到期时间")
@TableField("vip_end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime vipEndTime;
@ApiModelProperty(value = "单位id")
@@ -115,6 +115,7 @@
@ApiModelProperty(value = "最后一次登录时间")
@TableField("last_login_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime lastLoginTime;
@ApiModelProperty(value = "邀请人id")
@TableField("invite_user_id")
@@ -143,9 +144,7 @@
@ApiModelProperty("剩余天数")
@TableField(exist = false)
private Long lastDays;
- @ApiModelProperty(value = "单位名称")
- @TableField(exist = false)
- private String companyName;
+
}
--
Gitblit v1.7.1