From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 1f48457..e455dca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,8 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -29,6 +31,7 @@
* 鐢ㄦ埛ID
*/
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.STRING, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId
private String userId;
/**
@@ -108,32 +111,37 @@
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
})
+ @TableField(exist = false)
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
+ @TableField(exist = false)
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
+ @TableField(exist = false)
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
+ @TableField(exist = false)
private Long[] postIds;
/**
* 瑙掕壊ID
*/
+ @TableField(exist = false)
private Long roleId;
/**
* 鐩告満鎿嶆帶浼樺厛绾�
*/
- private Integer cameraPriority;
+ private String cameraPriority;
/**
* 鐢ㄦ埛铻嶄簯token
@@ -145,12 +153,26 @@
*/
private String appUserType;
/**
+ * app鐢ㄦ埛鍦ㄧ嚎鐘舵��
+ * 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String appOnlineState;
+ /**
* 鍏宠仈鎶ヨ绫诲瀷缁�
*/
+ @TableField(exist = false)
private List<String> commands;
public SysUser() {
+ }
+
+ public String getAppOnlineState() {
+ return appOnlineState;
+ }
+
+ public void setAppOnlineState(String appOnlineState) {
+ this.appOnlineState = appOnlineState;
}
public String getAppUserType() {
@@ -177,11 +199,11 @@
this.rongCloudToken = rongCloudToken;
}
- public Integer getCameraPriority() {
+ public String getCameraPriority() {
return cameraPriority;
}
- public void setCameraPriority(Integer cameraPriority) {
+ public void setCameraPriority(String cameraPriority) {
this.cameraPriority = cameraPriority;
}
--
Gitblit v1.9.3