From 5be07b1a021f596b003eac001f4cb77416ae6c7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 十二月 2024 17:08:47 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TAppUser.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TAppUser.java
index d407ccc..6a19c17 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TAppUser.java
@@ -34,9 +34,9 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- @Excel(width = 30,name = "用户ID")
private Long id;
-
+ @Excel(width = 30,name = "用户ID")
+ private String code;
@ApiModelProperty(value = "用户")
@TableField("name")
@Excel(width = 30,name = "用户昵称")
@@ -73,7 +73,6 @@
@ApiModelProperty(value = "市名称")
@TableField("city")
private String city;
- private String code;
@ApiModelProperty(value = "市区划代码")
@TableField("city_code")
@@ -105,10 +104,6 @@
@TableField("last_login_time")
private LocalDateTime lastLoginTime;
- @ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
- @Excel(width = 30,name = "用户状态", replace = {"正常_1", "冻结_2","注销_3"})
- @TableField("status")
- private Integer status;
@TableField("edit_name")
private String editName;
@@ -120,6 +115,9 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("is_delete")
private Boolean isDelete;
+ @ApiModelProperty(value = "是否设置偏好 1是 0否")
+ @TableField("is_set_preference")
+ private Integer isSetPreference;
@ApiModelProperty(value = "初次偏好设置")
@Excel(width = 30,name = "初次偏好设置")
@@ -137,6 +135,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private LocalDateTime createTime;
+ @ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
+ @Excel(width = 30,name = "用户状态", replace = {"正常_1", "冻结_2","注销_3"})
+ @TableField("status")
+ private Integer status;
@TableField(exist = false)
@Excel(width = 30,name = "注册时间")
private String createTimeStr;
--
Gitblit v1.7.1