From ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 九月 2024 11:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 32db936..90375e1 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -53,7 +54,9 @@
private Integer vipId;
@ApiModelProperty(value = "会员到期时间")
+
@TableField("vip_end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime vipEndTime;
@ApiModelProperty(value = "单位id")
@@ -123,6 +126,10 @@
@ApiModelProperty(value = "标签名称")
@TableField(exist = false)
private String tagName;
+
+ @ApiModelProperty(value = "单位名称")
+ @TableField(exist = false)
+ private String companyName;
@ApiModelProperty(value = "vip名称")
@TableField(exist = false)
private String vipName;
@@ -136,9 +143,7 @@
@ApiModelProperty("剩余天数")
@TableField(exist = false)
private Long lastDays;
- @ApiModelProperty(value = "单位名称")
- @TableField(exist = false)
- private String companyName;
+
}
--
Gitblit v1.7.1