From 42768c6785f312b5e110222e6e3178f1aa415a68 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 14:13:59 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 8 +++++---
1 files changed, 5 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 33c00db..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
@@ -126,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;
@@ -139,9 +143,7 @@
@ApiModelProperty("剩余天数")
@TableField(exist = false)
private Long lastDays;
- @ApiModelProperty(value = "单位名称")
- @TableField(exist = false)
- private String companyName;
+
}
--
Gitblit v1.7.1