From 1e4b4f686f4462786c75b9a9f2cd59f29d8b2140 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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..6ec6741 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
@@ -127,6 +127,10 @@
@ApiModelProperty(value = "备注")
private String remark;
+ @ApiModelProperty(value = "禁用账户备注")
+ @TableField("forbidden_remark")
+ private String forbiddenRemark;
+
@ApiModelProperty(value = "充电站")
@TableField(exist = false)
private List<String> siteNames;
@@ -407,6 +411,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