From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 4e3b4ca..0f376bd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -46,6 +46,12 @@
@TableField("user_name")
private String userName;
+ /** 用户账号 */
+ @Excel(name = "供应商联系人")
+ @TableField("contacts")
+ private String contacts;
+
+
/** 用户昵称 */
@Excel(name = "用户名称")
@NotBlank(message = "姓名不能为空")
@@ -74,7 +80,6 @@
/**
* 密码
*/
- @NotBlank(message = "密码不能为空")
private String password;
/** 帐号状态（0正常 1停用） */
@@ -125,27 +130,33 @@
*
*/
@ApiModelProperty(value = "角色类型 1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位", hidden = true)
+ @TableField("roleType")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ @TableField("passWordUpdate")
private Date passWordUpdate;
@ApiModelProperty(value = "对象ID")
+ @TableField("objectId")
private Integer objectId;
@ApiModelProperty(value = "备注")
+ @TableField("remark")
private String remark;
@ApiModelProperty(value = "角色名称")
@TableField(exist = false)
private String roleName;
+
+ @ApiModelProperty(value = "部门名称")
+ @TableField(exist = false)
+ private String deptName;
@ApiModelProperty(value = "是否为拍卖师 1=否 2=是")
@TableField(exist = false)
private Integer isAuctioneer;
- @ApiModelProperty(value = "供应商联系人")
- private String contacts;
/** 所属省名称 */
@TableField("province_name")
@@ -186,6 +197,10 @@
@TableField("town_code")
@ApiModelProperty(value = "town_code")
private String townCode;
+ @TableField(exist = false)
+ @ApiModelProperty("是否有出库审核管理、转移管理菜单权限")
+ private String isHaveCk;
+
--
Gitblit v1.7.1