From 4d54d652b4bdb4ab2f3ee6ba670348fab9b07365 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 13 八月 2024 11:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 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 8163aa5..91df803 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
@@ -62,11 +62,6 @@
/** 用户头像 */
private String avatar;
- /**
- * 登录账号
- */
- @TableField("account")
- private String account;
/** 密码 */
@NotBlank(message = "密码不能为空")
@@ -118,7 +113,7 @@
/**
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
- @ApiModelProperty(value = "角色类型 1=平台 2=公司 3=门店 4=修理厂")
+ @ApiModelProperty(value = "角色类型 1=平台 2=合作商")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@@ -129,6 +124,20 @@
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "充电站")
+ @TableField(exist = false)
+ private List<String> siteNames;
+
+ @ApiModelProperty(value = "充电站id", required = true)
+ @TableField(exist = false)
+ private List<Integer> siteIds;
+
+ @ApiModelProperty(value = "角色")
+ @TableField(exist = false)
+ private List<String> roleNames;
+
+
@Override
public String getRemark() {
@@ -271,14 +280,6 @@
this.avatar = avatar;
}
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
public String getPassword()
{
return password;
@@ -378,6 +379,32 @@
{
this.roleId = roleId;
}
+
+
+ public List<String> getSiteNames() {
+ return siteNames;
+ }
+
+ public void setSiteNames(List<String> siteNames) {
+ this.siteNames = siteNames;
+ }
+
+ public List<String> getRoleNames() {
+ return roleNames;
+ }
+
+ public List<Integer> getSiteIds() {
+ return siteIds;
+ }
+
+ public void setSiteIds(List<Integer> siteIds) {
+ this.siteIds = siteIds;
+ }
+
+ public void setRoleNames(List<String> roleNames) {
+ this.roleNames = roleNames;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.7.1