From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 0bbb062..05bac54 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
@@ -66,7 +66,6 @@
private String avatar;
/** 密码 */
- @NotBlank(message = "密码不能为空")
private String password;
/** 帐号状态（0正常 1停用） */
@@ -126,6 +125,10 @@
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "禁用账户备注")
+ @TableField("forbidden_remark")
+ private String forbiddenRemark;
@ApiModelProperty(value = "充电站")
@TableField(exist = false)
@@ -407,6 +410,14 @@
this.roleNames = roleNames;
}
+ public String getForbiddenRemark() {
+ return forbiddenRemark;
+ }
+
+ public void setForbiddenRemark(String forbiddenRemark) {
+ this.forbiddenRemark = forbiddenRemark;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.7.1