From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
index a977989..8dd946a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
@@ -15,7 +15,7 @@
/**
* 用户对象 sys_user
*
- * @author ruoyi
+ * @author jqs
*/
public class SysUser extends BaseEntity
{
@@ -28,6 +28,10 @@
/** 部门ID */
@Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId;
+
+ /** 用户账号 */
+ @Excel(name = "用户类型", readConverterExp = "00系统用户,01B端商户成员,03C端用户")
+ private String userType;
/** 用户账号 */
@Excel(name = "登录名称")
@@ -296,6 +300,15 @@
{
this.roleId = roleId;
}
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -318,6 +331,7 @@
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("userType", getUserType())
.toString();
}
}
--
Gitblit v1.7.1