From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 5a4ae2b..d4c8d9b 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停用） */
@@ -122,61 +127,75 @@
private Long roleId;
/**
- * 角色类型 1=平台 2=公司 3=门店 4=修理厂
+ *
*/
@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")
+ @ApiModelProperty(value = "所属省名称")
private String provinceName;
/** 所属省code */
@TableField("province_code")
+ @ApiModelProperty(value = "所属省code")
private String provinceCode;
/** 城市名称 */
@TableField("city_name")
+ @ApiModelProperty(value = "城市名称")
private String cityName;
/** 城市code */
@TableField("city_code")
+ @ApiModelProperty(value = "城市code")
private String cityCode;
/** 所属区县名称 */
@TableField("county_name")
+ @ApiModelProperty(value = "county_name")
private String countyName;
/** 所属区县code */
@TableField("county_code")
+ @ApiModelProperty(value = "county_code")
private String countyCode;
/** 所属街道名称 */
@TableField("town_name")
+ @ApiModelProperty(value = "town_name")
private String townName;
/** 所属街道code */
@TableField("town_code")
+ @ApiModelProperty(value = "town_code")
private String townCode;
--
Gitblit v1.7.1