From 2862c3e4da3adbb4bea43151514f0c43b86476d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 07 九月 2024 17:49:17 +0800
Subject: [PATCH] APP端冥想首页相关接口
---
xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
index d39f786..91f946e 100644
--- a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
+++ b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/SysUser.java
@@ -1,7 +1,6 @@
package com.xinquan.system.api.domain;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.xinquan.common.core.annotation.Excel;
import com.xinquan.common.core.annotation.Excel.ColumnType;
import com.xinquan.common.core.annotation.Excel.Type;
@@ -9,7 +8,7 @@
import com.xinquan.common.core.web.domain.BaseEntity;
import com.xinquan.common.core.xss.Xss;
import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -29,7 +28,7 @@
/** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
- @TableId("user_id")
+ @TableField("user_id")
private Long userId;
/** 部门ID */
@@ -85,7 +84,7 @@
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("login_date")
- private Date loginDate;
+ private LocalDateTime loginDate;
/** 部门对象 */
@Excels({
@@ -113,6 +112,17 @@
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "用户类型 00:管理后台用户 01:APP用户")
+ private String userType;
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
@Override
public String getRemark() {
@@ -271,12 +281,12 @@
this.loginIp = loginIp;
}
- public Date getLoginDate()
+ public LocalDateTime getLoginDate()
{
return loginDate;
}
- public void setLoginDate(Date loginDate)
+ public void setLoginDate(LocalDateTime loginDate)
{
this.loginDate = loginDate;
}
--
Gitblit v1.7.1