From 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 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 05bac54..84549eb 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
@@ -1,23 +1,24 @@
package com.ruoyi.system.api.domain;
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
/**
* 用户对象 sys_user
@@ -114,7 +115,7 @@
/**
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
- @ApiModelProperty(value = "角色类型 1=平台 2=合作商")
+ @ApiModelProperty(value = "角色类型 1=平台 2=门店")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@@ -130,13 +131,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)
@@ -385,25 +382,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) {
--
Gitblit v1.7.1