From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 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 14189c9..798c117 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
@@ -115,13 +115,15 @@
/**
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
- @ApiModelProperty(value = "角色类型 1=平台 2=合作商")
+ @ApiModelProperty(value = "角色类型 1=平台 2=门店")
+ @TableField("role_type")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date passWordUpdate;
@ApiModelProperty(value = "对象ID")
+ @TableField("objectId")
private Integer objectId;
@ApiModelProperty(value = "备注")
@@ -131,13 +133,9 @@
@TableField("forbidden_remark")
private String forbiddenRemark;
- @ApiModelProperty(value = "充电站")
- @TableField(exist = false)
- private List<String> siteNames;
-
- @ApiModelProperty(value = "充电站id", required = true)
- @TableField(exist = false)
- private List<Integer> siteIds;
+ @ApiModelProperty(value = "前端用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
@ApiModelProperty(value = "角色")
@TableField(exist = false)
@@ -386,25 +384,12 @@
this.roleId = roleId;
}
-
- public List<String> getSiteNames() {
- return siteNames;
+ public Long getAppUserId() {
+ return appUserId;
}
- 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 setAppUserId(Long appUserId) {
+ this.appUserId = appUserId;
}
public void setRoleNames(List<String> roleNames) {
@@ -418,7 +403,11 @@
public void setForbiddenRemark(String forbiddenRemark) {
this.forbiddenRemark = forbiddenRemark;
}
-
+
+ public List<String> getRoleNames() {
+ return roleNames;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.7.1